From 0dc684d091c25fd6601023d8bd1ab60f908cc46c Mon Sep 17 00:00:00 2001 From: Adam Kraitman Date: Wed, 13 Nov 2024 19:08:34 +0200 Subject: [PATCH] Updating builders java openjdk to version 17 on both rhel and debian distros Signed-off-by: Adam Kraitman --- ansible/examples/builder.yml | 54 ++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/ansible/examples/builder.yml b/ansible/examples/builder.yml index 22c1b4d74..4d0baacd0 100644 --- a/ansible/examples/builder.yml +++ b/ansible/examples/builder.yml @@ -10,19 +10,20 @@ become: true user: ubuntu # This should be overridden on the CLI (e.g., -e user=centos). It doesn't matter on a mita/prado builder because the playbook is run locally by root. vars: - - libvirt: false # Should vagrant be installed? - - permanent: false # Is this a permanent builder? Since the ephemeral (non-permanent) tasks get run more often, we'll default to false. - - jenkins_user: 'jenkins-build' - - api_user: 'ceph-jenkins' - - api_uri: 'https://jenkins.ceph.com' - - jenkins_credentials_uuid: 'jenkins-build' - - nodename: '{{ nodename }}' - - label: "{{ jenkins_labels[inventory_hostname] }}" - - grant_sudo: true - - osc_user: 'username' - - osc_pass: 'password' - - container_mirror: 'docker-mirror.front.sepia.ceph.com:5000' - - secrets_path: "{{ lookup('env', 'ANSIBLE_SECRETS_PATH') | default('/etc/ansible/secrets', true) }}" + libvirt: false # Should vagrant be installed? + permanent: false # Is this a permanent builder? Since the ephemeral (non-permanent) tasks get run more often, we'll default to false. + jenkins_user: 'jenkins-build' + api_user: 'ceph-jenkins' + api_uri: 'https://jenkins.ceph.com' + jenkins_credentials_uuid: 'jenkins-build' + nodename: '{{ nodename }}' + label: "{{ jenkins_labels[inventory_hostname] }}" + grant_sudo: true + osc_user: 'username' + 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 @@ -831,6 +833,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: @@ -935,9 +958,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