Skip to content

Commit

Permalink
ansible: Migrate IBM i to Java 17
Browse files Browse the repository at this point in the history
  • Loading branch information
abmusse committed Dec 10, 2024
1 parent 67f98e1 commit b69b759
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ansible/inventory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 8 additions & 0 deletions ansible/roles/bootstrap/files/ibmi-git.sh
Original file line number Diff line number Diff line change
@@ -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 "$@"
4 changes: 4 additions & 0 deletions ansible/roles/bootstrap/tasks/partials/ibmi74.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- name: "ibmi : create git wrapper"
ansible.builtin.copy:
dest: /QOpenSys/pkgs/bin/git-jenkins
src: "ibmi-git.sh"
1 change: 0 additions & 1 deletion ansible/roles/java-base/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/jenkins-worker/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit b69b759

Please sign in to comment.