Merge branch 'INFRA-5214' into 'master'

Set java version in vars/main.yml and change JAVA_HOME in setenv

See merge request !12

defaults/main.yml

 ---
 # EPICS Archiver Appliance release and url
-epicsarchiverap_release: "0.0.1_SNAPSHOT_15-November-2018T10-27-25"
-epicsarchiverap_release_tag: "v0.0.1_SNAPSHOT_15-Nov-2018"
+epicsarchiverap_release: "0.0.1_SNAPSHOT_30-September-2021T08-25-29"
+epicsarchiverap_release_tag: "v0.0.1_SNAPSHOT_30-Sep-2021"
 epicsarchiverap_release_name: "archappl_v{{ epicsarchiverap_release }}"
 epicsarchiverap_url: "https://artifactory.esss.lu.se/artifactory/swi-pkg/archiver-appliance/{{ epicsarchiverap_release_tag }}/{{ epicsarchiverap_release_name }}.tar.gz"
 

molecule/default/molecule.yml

@@ -11,9 +11,9 @@ provisioner:
   inventory:
     group_vars:
       archiver_appliance:
-        epicsarchiverap_java_maxmetaspace: "128M"
-        epicsarchiverap_java_initial_heapsize: "128M"
-        epicsarchiverap_java_max_heapsize: "128M"
+        epicsarchiverap_java_maxmetaspace: "256M"
+        epicsarchiverap_java_initial_heapsize: "512M"
+        epicsarchiverap_java_max_heapsize: "512M"
       aa_cluster01:
         epicsarchiverap_cluster: aa_cluster01
         epicsarchiverap_data_retrieval_url: http://appliance.example.org/retrieval
@@ -30,11 +30,12 @@ platforms:
     # SYS_ADMIN required to run systemctl
     capabilities:
       - SYS_ADMIN
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    command: /sbin/init
     tmpfs:
       - /run
-    command: /sbin/init
+      - /tmp
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
       - archiver_appliance
   - name: ics-ans-role-epicsarchiverap-cluster-01
@@ -44,6 +45,9 @@ platforms:
       - SYS_ADMIN
     tmpfs:
       - /run
+      - /tmp
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     command: /sbin/init
     groups:
       - archiver_appliance
@@ -53,9 +57,12 @@ platforms:
     # SYS_ADMIN required to run systemctl
     capabilities:
       - SYS_ADMIN
+    command: /sbin/init
     tmpfs:
       - /run
-    command: /sbin/init
+      - /tmp
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     groups:
       - archiver_appliance
       - aa_cluster01

templates/setenv.sh.j2

@@ -19,7 +19,7 @@ CATALINA_OPTS="-XX:MaxMetaspaceSize={{ epicsarchiverap_java_maxmetaspace }} -XX:
 
 #   JAVA_HOME       Must point at your Java Development Kit installation.
 #                   Required to run the with the "debug" argument.
-JAVA_HOME="{{ java_oracle_jdk8_home }}"
+JAVA_HOME="{{ java_openjdk_home }}"
 
 #   JRE_HOME        Must point at your Java Runtime installation.
 #                   Defaults to JAVA_HOME if empty. If JRE_HOME and JAVA_HOME

vars/main.yml

 ---
+java_install_oracle_jdk8: false
+java_openjdk_version: "17.0.3+7"
+
 epicsarchiverap_tomcat_gid: 53
 epicsarchiverap_tomcat_uid: 53
 epicsarchiverap_tomcat_home: /opt/apache-tomcat