fixup! fixup! ansible: Migrate IBM i to Java 17

nodejs · Dec 10, 2024 · 6ecbde7 · 6ecbde7
1 parent cdd38e3
commit 6ecbde7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
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/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}"