ansible: use Java 11 on AIX

Update the JRE used to run the Jenkins agent on AIX to Java 11. Also adds `/opt/freeware/bin` to the `PATH` for the agent to pick up binaries from yum packages that no longer create symbolic links in `/usr/bin`.
nodejs · Sep 23, 2021 · fa683b6 · fa683b6
1 parent 3efa8e4
commit fa683b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml
@@ -28,7 +28,7 @@ java_package_name: "{{ packages[os]|default(packages[os|stripversion])|default('
 # override arch to be on the safe side.
 adoptopenjdk: {
   aix71_ppc64: { arch: ppc64 },
-  aix72_ppc64: { arch: ppc64 },
+  aix72_ppc64: { arch: ppc64, version: 11 },
   centos7_ppc64: {},
   rhel7_s390x: {}
 }

diff --git a/ansible/roles/jenkins-worker/templates/aix.rc2.j2 b/ansible/roles/jenkins-worker/templates/aix.rc2.j2
@@ -16,6 +16,7 @@ start )
               export HOME=/home/{{server_user}}; \
               export NODE_TEST_DIR=$HOME/tmp; \
               export NODE_COMMON_PIPE="$HOME/test.pipe"; \
+              export PATH=/opt/freeware/bin:$PATH; \
               export OSTYPE=AIX72; \
               export JOBS={{ jobs_env }}; \
         /usr/bin/java -Xmx128m -Dorg.jenkinsci.plugins.gitclient.Git.timeOut=30 -jar "$HOME/slave.jar" \