Updating java openjdk to version 17 on rhel and debian builders, I have added the...

Signed-off-by: Adam Kraitman <akraitma@li-8b09b2cc-35b7-11b2-a85c-cd1dbade58f9.ibm.com>

diff --git a/ansible/examples/builder.yml b/ansible/examples/builder.yml
index 6c72ec5f8da39f00fe03242bbf4cf1053013ff98..33a179efc43ceb640c87a8eeb891987630d2248a 100644 (file)
--- a/ansible/examples/builder.yml
+++ b/ansible/examples/builder.yml
@@ -23,6 +23,7 @@
     osc_pass: 'password'
     container_mirror: 'docker-mirror.front.sepia.ceph.com:5000'
     secrets_path: "{{ lookup('env', 'ANSIBLE_SECRETS_PATH') | default('/etc/ansible/secrets', true) }}"
+    java_version: 'java-17'
 
 
   tasks:
@@ -56,6 +57,7 @@
           - libffi-dev
           - default-jdk
           - default-jre
+          - openjdk-17-jdk
           - debian-keyring
           - debian-archive-keyring
           - software-properties-common
@@ -144,7 +146,7 @@
     - set_fact:
         universal_rpms:
           - createrepo
-          - java-11-openjdk
+          - java-17-openjdk
           - git
           - libtool
           #- rpm-sign
@@ -832,6 +834,27 @@
         - libvirt-guests
       when: libvirt|bool
 
+    - name: Set java alternative for debian
+      block:
+        - name: Get java version alternative
+          shell: >-
+            update-alternatives --query java | awk -F':' '/{{ java_version }}/ && /Alternative/ {print $2}'
+          register: java_alternatives
+          changed_when: false
+
+        - name: Set java version alternative
+          alternatives:
+            name: java
+            path: "{{ java_alternatives.stdout.strip() }}"
+      when:
+        - (ansible_os_family | lower) == 'debian'
+
+    - name: Set java version alternative for RedHat
+      shell:
+        cmd: update-alternatives --set java '{{ java_version }}-openjdk.{{ ansible_architecture }}'
+      when:
+        - (ansible_os_family | lower) == 'redhat'
+
     ## CONTAINER SERVICE TASKS
     - name: Container Tasks
       block:
@@ -936,9 +959,10 @@
           register: jar_changed
 
         - name: Install the systemd unit files for jenkins
-          template:
+          ansible.builtin.template:
             src: "templates/systemd/jenkins.{{ item }}.j2"
             dest: "/etc/systemd/system/jenkins.{{ item }}"
+            force: yes
           with_items:
             - service
             - secret