Skip to content

Commit 7f547d0

Browse files
authored
Support RockyLinux 9 (#164)
* add RL9/OHPCv3 repos * FIXME: use crb instead of powertools * fix apptainer/singularity clash: openhpc/ohpc#1889 (comment) * FIXME: add cgroup.conf * FIXME: don't use outdated pgid for proctracktype * bump CI to include RL9 * fix linter errors * fix molecule instance creation for RL9 * bump RL8 CI image * fix powertools/crb repos * fix container startup * bump GH actions version to avoid node version warning in CI * minimise PR differences * include cgroup.conf template from upstream * pin molecule-podman to avoid ansible-community/molecule-plugins#242
1 parent 1a6e941 commit 7f547d0

File tree

23 files changed

+125
-71
lines changed

23 files changed

+125
-71
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ name: CI
77
- master
88

99
jobs:
10-
11-
test:
10+
molecule:
1211
name: Molecule
1312
# Workaround: systemd/kernel compatibility issue:
1413
# Failed to parse bus message: Invalid argument
@@ -24,7 +23,8 @@ jobs:
2423
fail-fast: false
2524
matrix:
2625
image:
27-
- 'rockylinux:8.8'
26+
- 'rockylinux:8.9'
27+
- 'rockylinux:9.3'
2828
scenario:
2929
- test1
3030
- test1b
@@ -47,7 +47,7 @@ jobs:
4747

4848
steps:
4949
- name: Check out the codebase.
50-
uses: actions/checkout@v3
50+
uses: actions/checkout@v4
5151

5252
- name: Set up Python 3.
5353
uses: actions/setup-python@v4
@@ -56,7 +56,7 @@ jobs:
5656

5757
- name: Install test dependencies.
5858
run: |
59-
pip3 install -U ansible molecule-podman yamllint ansible-lint
59+
pip3 install -U pip ansible>=2.9.0 molecule-plugins[podman]==23.5.0 yamllint ansible-lint
6060
ansible-galaxy collection install containers.podman:>=1.10.1 # otherwise get https://github.com/containers/ansible-podman-collections/issues/428
6161
6262
- name: Display ansible version
@@ -75,21 +75,21 @@ jobs:
7575
ANSIBLE_FORCE_COLOR: '1'
7676
MOLECULE_IMAGE: ${{ matrix.image }}
7777

78-
runonce:
78+
checks:
7979
name: Checks
80-
runs-on: ubuntu-20.04
80+
runs-on: ubuntu-22.04
8181
steps:
8282
- name: Check out the codebase.
8383
uses: actions/checkout@v3
8484

8585
- name: Set up Python 3.
86-
uses: actions/setup-python@v4
86+
uses: actions/setup-python@v5
8787
with:
8888
python-version: '3.9'
8989

9090
- name: Install test dependencies.
9191
run: |
92-
pip3 install -U ansible molecule[podman] yamllint ansible-lint
92+
pip3 install -U ansible ansible-lint
9393
ansible-galaxy collection install containers.podman:>=1.10.1 # otherwise get https://github.com/containers/ansible-podman-collections/issues/428
9494
9595
- name: Display ansible version

defaults/main.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,19 @@ openhpc_enable:
4949
openhpc_extra_repos: []
5050

5151
ohpc_openhpc_repos:
52+
"9":
53+
- name: OpenHPC
54+
file: OpenHPC
55+
description: OpenHPC-3 - Base
56+
baseurl: "http://repos.openhpc.community/OpenHPC/3/EL_9"
57+
gpgcheck: true
58+
gpgkey: https://raw.githubusercontent.com/openhpc/ohpc/v3.0.GA/components/admin/ohpc-release/SOURCES/RPM-GPG-KEY-OpenHPC-3
59+
- name: OpenHPC-updates
60+
file: OpenHPC
61+
description: OpenHPC-3 - Updates
62+
baseurl: "http://repos.openhpc.community/OpenHPC/3/updates/EL_9"
63+
gpgcheck: true
64+
gpgkey: https://raw.githubusercontent.com/openhpc/ohpc/v3.0.GA/components/admin/ohpc-release/SOURCES/RPM-GPG-KEY-OpenHPC-3
5265
"8":
5366
- name: OpenHPC
5467
file: OpenHPC
@@ -64,6 +77,13 @@ ohpc_openhpc_repos:
6477
gpgkey: https://raw.githubusercontent.com/openhpc/ohpc/v2.6.1.GA/components/admin/ohpc-release/SOURCES/RPM-GPG-KEY-OpenHPC-2
6578

6679
ohpc_default_extra_repos:
80+
"9":
81+
- name: epel
82+
file: epel
83+
description: "Extra Packages for Enterprise Linux $releasever - $basearch"
84+
metalink: "https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir"
85+
gpgcheck: true
86+
gpgkey: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9"
6787
"8":
6888
- name: epel
6989
file: epel

molecule/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Local installation on a RockyLinux 8.x machine looks like:
4242
Then to run tests, e.g.::
4343

4444
cd ansible-role-openhpc/
45-
MOLECULE_IMAGE=rockylinux:8.8 molecule test --all
45+
MOLECULE_IMAGE=rockylinux:8.9 molecule test --all
4646

4747
During development you may want to:
4848

molecule/test1/molecule.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ platforms:
77
pre_build_image: true
88
groups:
99
- testohpc_login
10-
command: /sbin/init
10+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
1111
tmpfs:
1212
- /run
1313
- /tmp
@@ -19,7 +19,7 @@ platforms:
1919
pre_build_image: true
2020
groups:
2121
- testohpc_compute
22-
command: /sbin/init
22+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
2323
tmpfs:
2424
- /run
2525
- /tmp
@@ -31,7 +31,7 @@ platforms:
3131
pre_build_image: true
3232
groups:
3333
- testohpc_compute
34-
command: /sbin/init
34+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
3535
tmpfs:
3636
- /run
3737
- /tmp

molecule/test10/molecule.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ platforms:
88
groups:
99
- testohpc_login
1010
- initial
11-
command: /sbin/init
11+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
1212
tmpfs:
1313
- /run
1414
- /tmp
@@ -21,7 +21,7 @@ platforms:
2121
groups:
2222
- testohpc_compute
2323
- initial
24-
command: /sbin/init
24+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
2525
tmpfs:
2626
- /run
2727
- /tmp
@@ -34,7 +34,7 @@ platforms:
3434
groups:
3535
- testohpc_compute
3636
- initial
37-
command: /sbin/init
37+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
3838
tmpfs:
3939
- /run
4040
- /tmp
@@ -46,7 +46,7 @@ platforms:
4646
pre_build_image: true
4747
groups: # NB this is NOT in the "testohpc_compute" so that it isn't added to slurm.conf initially
4848
- new
49-
command: /sbin/init
49+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
5050
tmpfs:
5151
- /run
5252
- /tmp

molecule/test11/molecule.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ platforms:
77
pre_build_image: true
88
groups:
99
- testohpc_login
10-
command: /sbin/init
10+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
1111
tmpfs:
1212
- /run
1313
- /tmp
@@ -21,7 +21,7 @@ platforms:
2121
- testohpc_compute
2222
- testohpc_compute_orig
2323
- testohpc_compute_new
24-
command: /sbin/init
24+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
2525
tmpfs:
2626
- /run
2727
- /tmp
@@ -34,7 +34,7 @@ platforms:
3434
groups:
3535
- testohpc_compute
3636
- testohpc_compute_orig
37-
command: /sbin/init
37+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
3838
tmpfs:
3939
- /run
4040
- /tmp

molecule/test12/molecule.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ platforms:
77
pre_build_image: true
88
groups:
99
- testohpc_login
10-
command: /sbin/init
10+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
1111
tmpfs:
1212
- /run
1313
- /tmp
@@ -19,7 +19,7 @@ platforms:
1919
pre_build_image: true
2020
groups:
2121
- testohpc_compute
22-
command: /sbin/init
22+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
2323
tmpfs:
2424
- /run
2525
- /tmp
@@ -31,7 +31,7 @@ platforms:
3131
pre_build_image: true
3232
groups:
3333
- testohpc_compute
34-
command: /sbin/init
34+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
3535
tmpfs:
3636
- /run
3737
- /tmp

molecule/test13/molecule.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ platforms:
77
pre_build_image: true
88
groups:
99
- testohpc_control
10-
command: /sbin/init
10+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
1111
tmpfs:
1212
- /run
1313
- /tmp
@@ -20,7 +20,7 @@ platforms:
2020
pre_build_image: true
2121
groups:
2222
- testohpc_login
23-
command: /sbin/init
23+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
2424
tmpfs:
2525
- /run
2626
- /tmp
@@ -33,7 +33,7 @@ platforms:
3333
pre_build_image: true
3434
groups:
3535
- testohpc_login
36-
command: /sbin/init
36+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
3737
tmpfs:
3838
- /run
3939
- /tmp
@@ -46,7 +46,7 @@ platforms:
4646
pre_build_image: true
4747
groups:
4848
- testohpc_compute
49-
command: /sbin/init
49+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
5050
tmpfs:
5151
- /run
5252
- /tmp
@@ -58,7 +58,7 @@ platforms:
5858
pre_build_image: true
5959
groups:
6060
- testohpc_compute
61-
command: /sbin/init
61+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
6262
tmpfs:
6363
- /run
6464
- /tmp

molecule/test14/molecule.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ platforms:
77
pre_build_image: true
88
groups:
99
- testohpc_login
10-
command: /sbin/init
10+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
1111
tmpfs:
1212
- /run
1313
- /tmp
@@ -19,7 +19,7 @@ platforms:
1919
pre_build_image: true
2020
groups:
2121
- testohpc_compute
22-
command: /sbin/init
22+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
2323
tmpfs:
2424
- /run
2525
- /tmp
@@ -31,7 +31,7 @@ platforms:
3131
pre_build_image: true
3232
groups:
3333
- testohpc_compute
34-
command: /sbin/init
34+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
3535
tmpfs:
3636
- /run
3737
- /tmp

molecule/test1b/molecule.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ platforms:
99
pre_build_image: true
1010
groups:
1111
- testohpc_login
12-
command: /sbin/init
12+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
1313
tmpfs:
1414
- /run
1515
- /tmp
@@ -21,7 +21,7 @@ platforms:
2121
pre_build_image: true
2222
groups:
2323
- testohpc_compute
24-
command: /sbin/init
24+
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
2525
tmpfs:
2626
- /run
2727
- /tmp

0 commit comments

Comments
 (0)