Skip to content

Commit

Permalink
ansible: add test-ibm-rhel9-x64-1
Browse files Browse the repository at this point in the history
Replace test-centos7-x64-1 which was hosted on IBM Cloud at SJC1
(which is closing) with a new IBM Cloud hosted server running RHEL 9.
  • Loading branch information
richardlau committed Mar 27, 2024
1 parent 11ee0af commit 470488a
Show file tree
Hide file tree
Showing 9 changed files with 78 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ansible/inventory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ hosts:
rhel8-x64-1: {ip: 169.61.75.51, build_test_v8: yes}
rhel8-x64-2: {ip: 169.61.75.58, build_test_v8: yes}
rhel8-x64-3: {ip: 52.117.26.13, build_test_v8: yes}
rhel9-x64-1: {ip: 169.60.150.92}
ubuntu1804-x64-1: {ip: 52.117.26.14, alias: jenkins-workspace-6}
ubuntu2204-x64-1: {ip: 169.60.150.82}
ubuntu2204-x64-2: {ip: 169.44.168.2}
Expand Down Expand Up @@ -330,6 +331,5 @@ hosts:
win2022_vs2022-x64-6: {}

- softlayer:
centos7-x64-1: {ip: 50.23.85.250}
debian10-x64-1: {ip: 169.44.16.126}
debian12-x64-1: {ip: 169.60.150.88}
14 changes: 14 additions & 0 deletions ansible/roles/baselayout/tasks/partials/repo/rhel9.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---

# Red Hat Enterprise Linux 9

- name: install GPG key for EPEL 9
become: yes
ansible.builtin.rpm_key:
key: https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9
state: present

- name: install EPEL 8
ansible.builtin.dnf:
name: https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
state: present
4 changes: 4 additions & 0 deletions ansible/roles/baselayout/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@ packages: {
'ccache,cmake,gcc-c++,gcc-toolset-10,gcc-toolset-10-libatomic-devel,gcc-toolset-11,gcc-toolset-12,gcc-toolset-13,git,make,python3',
],

rhel9: [
'ccache,cmake,gcc-c++,gcc-toolset-12,gcc-toolset-12-libatomic-devel,gcc-toolset-13,gcc-toolset-13-libatomic-devel,git,make,python3',
],

smartos: [
'gccmakedep',
'git',
Expand Down
21 changes: 21 additions & 0 deletions ansible/roles/bootstrap/tasks/partials/rhel9.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---

# Red Hat Enterprise Linux 9

# Set the hostname as it will be used by subscription manager.
- name: gather facts
setup:

- name: set hostname
ansible.builtin.hostname:
name: "{{ inventory_hostname | regex_replace('_', '--') }}"

- name: register Red Hat subscription
community.general.redhat_subscription:
activationkey: "{{ secrets.rh_activationkey }}"
org_id: "{{ secrets.rh_org }}"
state: present

- name: set up swap on Linux
include_tasks: linux-swap.yml
when: swap_file_size_mb is defined
1 change: 1 addition & 0 deletions ansible/roles/java-base/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ packages: {
'macos': 'temurin17',
'rhel7': 'java-11-openjdk',
'rhel8': 'java-17-openjdk',
'rhel9': 'java-17-openjdk',
'smartos': 'openjdk11',
'ubuntu': 'openjdk-17-jre-headless',
'ubuntu1604': 'openjdk-8-jre-headless',
Expand Down
16 changes: 16 additions & 0 deletions ansible/roles/jenkins-worker/tasks/partials/tap2junit/rhel9.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---

#
# install tap2junit from pip
#

- name: install pip
ansible.builtin.dnf:
name: python3-pip
state: present

- name: install tap2junit
ansible.builtin.pip:
executable: /usr/bin/pip3
name: tap2junit=={{ tap2junit_version }}
state: present
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 @@ -9,7 +9,7 @@ init: {
freebsd: 'freebsd',
ibmi: 'ibmi73',
macos: 'macos',
systemd: ['centos7', 'debian', 'fedora', 'rhel7', 'rhel8', 'ubuntu1604', 'ubuntu1804','ubuntu2204'],
systemd: ['centos7', 'debian', 'fedora', 'rhel7', 'rhel8', 'rhel9', 'ubuntu1604', 'ubuntu1804','ubuntu2204'],
svc: 'smartos',
zos_start: 'zos'
}
Expand Down
19 changes: 19 additions & 0 deletions ansible/roles/package-upgrade/handlers/partials/rhel9.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---

# Red Hat Enterpise Linux 9 bootstrap handlers

# If packages are updated, force a check-in with Subscription Manager to
# reflect the current state.
- name: clear rhsm cache
ansible.builtin.file:
name: /var/lib/rhsm/cache/profile.json
state: absent

- name: stop rhsmcertd
ansible.builtin.systemd:
name: rhsmcertd
state: stopped

- name: run rhsmcertd
ansible.builtin.command:
cmd: rhsmcertd --now
2 changes: 1 addition & 1 deletion ansible/roles/package-upgrade/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
pm: {
'yum': ['centos', 'rhel7', 'aix72', 'ibmi'],
'apt': ['debian', 'ubuntu'],
'dnf': ['aix73', 'fedora', 'rhel8'],
'dnf': ['aix73', 'fedora', 'rhel8', 'rhel9'],
'pkgng': 'freebsd',
'pkgin': 'smartos',
'chocolatey': 'win',
Expand Down

0 comments on commit 470488a

Please sign in to comment.