ansible: Migrate IBM i to Java 17 (#3978)

Also update the IBM i 7.3 iinthecloud machines to IBM i 7.4.
nodejs · Dec 11, 2024 · 6e4c765 · 6e4c765
1 parent 3482387
commit 6e4c765
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 10 deletions.
diff --git a/ansible/inventory.yml b/ansible/inventory.yml
@@ -291,8 +291,8 @@ hosts:
             user: admin
 
     - iinthecloud:
-        ibmi73-ppc64_be-1: {ip: 65.183.160.52, user: nodejs}
-        ibmi73-ppc64_be-2: {ip: 65.183.160.59, user: nodejs}
+        ibmi74-ppc64_be-1: {ip: 65.183.160.52, user: nodejs}
+        ibmi74-ppc64_be-2: {ip: 65.183.160.59, user: nodejs}
 
     - rzkh:
         ibmi73-ppc64_be-1:

diff --git a/...baselayout/tasks/partials/repo/ibmi73.yml → ...baselayout/tasks/partials/repo/ibmi74.yml b/...baselayout/tasks/partials/repo/ibmi73.yml → ...baselayout/tasks/partials/repo/ibmi74.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: ibmi73 | remove old repositories
+- name: ibmi74 | remove old repositories
   ansible.builtin.yum_repository:
     name: "{{ item }}"
     reposdir: /QOpenSys/etc/yum/repos.d
@@ -9,7 +9,7 @@
     - ibm
     - ibm-7.3
 
-- name: ibmi73 | install IBM i repositories
+- name: ibmi74 | install IBM i repositories
   ansible.builtin.yum:
     name: ibmi-repos
     state: present
diff --git a/ansible/roles/bootstrap/files/ibmi-git.sh b/ansible/roles/bootstrap/files/ibmi-git.sh
@@ -0,0 +1,8 @@
+#!/QOpenSys/usr/bin/ksh
+
+# Create a git wrapper at /QOpenSys/pkgs/bin/git-jenkins and
+# configure it as the "git tool" in Jenkins UI because JV1 Java
+# which forces LIBPATH=/usr/lib prior to calling any program
+# IBM i open source packages are intalled under /QOpenSys/...
+unset LIBPATH
+exec /QOpenSys/pkgs/bin/git "$@"
diff --git a/ansible/roles/bootstrap/tasks/partials/ibmi74.yml b/ansible/roles/bootstrap/tasks/partials/ibmi74.yml
@@ -0,0 +1,4 @@
+- name: "ibmi : create git wrapper"
+  ansible.builtin.copy:
+    dest: /QOpenSys/pkgs/bin/git-jenkins
+    src: "ibmi-git.sh"
diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml
@@ -12,7 +12,6 @@ packages: {
   'debian12': 'openjdk-17-jre-headless',
   'fedora': 'java-17-openjdk-headless',
   'freebsd': 'openjdk17-jre',
-  'ibmi': 'openjdk-11-ea',
   'macos': 'temurin17',
   'rhel7': 'java-11-openjdk',
   'rhel8': 'java-17-openjdk',

diff --git a/ansible/roles/jenkins-worker/vars/main.yml b/ansible/roles/jenkins-worker/vars/main.yml
@@ -7,7 +7,7 @@
 init: {
   aix: ['aix72', 'aix73'],
   freebsd: 'freebsd',
-  ibmi: 'ibmi73',
+  ibmi: 'ibmi74',
   macos: 'macos',
   systemd: ['centos7', 'debian', 'fedora', 'rhel7', 'rhel8', 'rhel9', 'ubuntu1604', 'ubuntu1804','ubuntu2204'],
   svc: 'smartos',
@@ -61,7 +61,7 @@ jenkins: "{{ jenkins_init[init_type] }}"
 
 # some os'es needs different paths to java. add them here.
 java_path: {
-  'ibmi73': '/QOpenSys/pkgs/lib/jvm/openjdk-11/bin/java',
+  'ibmi74': '/QOpenSys/QIBM/ProdData/JavaVM/jdk17/64bit/bin/java',
   'macos10.15': 'java',
   'macos11': 'java',
   'macos11.0': 'java',

diff --git a/jenkins/scripts/select-compiler.sh b/jenkins/scripts/select-compiler.sh
@@ -23,7 +23,7 @@ if [ "$DONTSELECT_COMPILER" != "DONT" ]; then
     *x64* ) SELECT_ARCH=X64 ;;
     *arm64* ) SELECT_ARCH=ARM64 ;;
     *armv7l* ) SELECT_ARCH=ARMV7L ;;
-    *ibmi73* ) SELECT_ARCH=IBMI73 ;;
+    *ibmi74* ) SELECT_ARCH=IBMI74 ;;
   esac
 fi
 
@@ -191,13 +191,13 @@ elif [ "$SELECT_ARCH" = "S390X" ]; then
     echo "Compiler set to $COMPILER_LEVEL"
   fi
 
-elif [ "$SELECT_ARCH" = "IBMI73" ]; then
+elif [ "$SELECT_ARCH" = "IBMI74" ]; then
   if [ "$NODEJS_MAJOR_VERSION" -gt "22" ]; then
     export COMPILER_LEVEL="12"
   else
     export COMPILER_LEVEL="10"
   fi
-  echo "Setting compiler for Node version $NODEJS_MAJOR_VERSION on IBMI73"
+  echo "Setting compiler for Node version $NODEJS_MAJOR_VERSION on IBMI74"
   export CC="ccache gcc-${COMPILER_LEVEL}"
   export CXX="ccache g++-${COMPILER_LEVEL}"
   export LINK="g++-${COMPILER_LEVEL}"