Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support RockyLinux 9 #164

Merged
merged 15 commits into from
Feb 20, 2024
Merged
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ name: CI
- master

jobs:

test:
molecule:
name: Molecule
# Workaround: systemd/kernel compatibility issue:
# Failed to parse bus message: Invalid argument
Expand All @@ -24,7 +23,8 @@ jobs:
fail-fast: false
matrix:
image:
- 'rockylinux:8.8'
- 'rockylinux:8.9'
- 'rockylinux:9.3'
scenario:
- test1
- test1b
Expand All @@ -47,7 +47,7 @@ jobs:

steps:
- name: Check out the codebase.
uses: actions/checkout@v3
uses: actions/checkout@v4

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

- name: Install test dependencies.
run: |
pip3 install -U ansible molecule-podman yamllint ansible-lint
pip3 install -U pip ansible>=2.9.0 molecule-plugins[podman]==23.5.0 yamllint ansible-lint
ansible-galaxy collection install containers.podman:>=1.10.1 # otherwise get https://github.com/containers/ansible-podman-collections/issues/428

- name: Display ansible version
Expand All @@ -75,21 +75,21 @@ jobs:
ANSIBLE_FORCE_COLOR: '1'
MOLECULE_IMAGE: ${{ matrix.image }}

runonce:
checks:
name: Checks
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Check out the codebase.
uses: actions/checkout@v3

- name: Set up Python 3.
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.9'

- name: Install test dependencies.
run: |
pip3 install -U ansible molecule[podman] yamllint ansible-lint
pip3 install -U ansible ansible-lint
ansible-galaxy collection install containers.podman:>=1.10.1 # otherwise get https://github.com/containers/ansible-podman-collections/issues/428

- name: Display ansible version
Expand Down
20 changes: 20 additions & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,19 @@ openhpc_enable:
openhpc_extra_repos: []

ohpc_openhpc_repos:
"9":
- name: OpenHPC
file: OpenHPC
description: OpenHPC-3 - Base
baseurl: "http://repos.openhpc.community/OpenHPC/3/EL_9"
gpgcheck: true
gpgkey: https://raw.githubusercontent.com/openhpc/ohpc/v3.0.GA/components/admin/ohpc-release/SOURCES/RPM-GPG-KEY-OpenHPC-3
- name: OpenHPC-updates
file: OpenHPC
description: OpenHPC-3 - Updates
baseurl: "http://repos.openhpc.community/OpenHPC/3/updates/EL_9"
gpgcheck: true
gpgkey: https://raw.githubusercontent.com/openhpc/ohpc/v3.0.GA/components/admin/ohpc-release/SOURCES/RPM-GPG-KEY-OpenHPC-3
"8":
- name: OpenHPC
file: OpenHPC
Expand All @@ -64,6 +77,13 @@ ohpc_openhpc_repos:
gpgkey: https://raw.githubusercontent.com/openhpc/ohpc/v2.6.1.GA/components/admin/ohpc-release/SOURCES/RPM-GPG-KEY-OpenHPC-2

ohpc_default_extra_repos:
"9":
- name: epel
file: epel
description: "Extra Packages for Enterprise Linux $releasever - $basearch"
metalink: "https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir"
gpgcheck: true
gpgkey: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9"
"8":
- name: epel
file: epel
Expand Down
2 changes: 1 addition & 1 deletion molecule/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Local installation on a RockyLinux 8.x machine looks like:
Then to run tests, e.g.::

cd ansible-role-openhpc/
MOLECULE_IMAGE=rockylinux:8.8 molecule test --all
MOLECULE_IMAGE=rockylinux:8.9 molecule test --all

During development you may want to:

Expand Down
6 changes: 3 additions & 3 deletions molecule/test1/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_login
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
sjpb marked this conversation as resolved.
Show resolved Hide resolved
tmpfs:
- /run
- /tmp
Expand All @@ -19,7 +19,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_compute
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -31,7 +31,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_compute
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand Down
8 changes: 4 additions & 4 deletions molecule/test10/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ platforms:
groups:
- testohpc_login
- initial
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -21,7 +21,7 @@ platforms:
groups:
- testohpc_compute
- initial
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -34,7 +34,7 @@ platforms:
groups:
- testohpc_compute
- initial
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -46,7 +46,7 @@ platforms:
pre_build_image: true
groups: # NB this is NOT in the "testohpc_compute" so that it isn't added to slurm.conf initially
- new
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand Down
6 changes: 3 additions & 3 deletions molecule/test11/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_login
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -21,7 +21,7 @@ platforms:
- testohpc_compute
- testohpc_compute_orig
- testohpc_compute_new
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -34,7 +34,7 @@ platforms:
groups:
- testohpc_compute
- testohpc_compute_orig
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand Down
6 changes: 3 additions & 3 deletions molecule/test12/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_login
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -19,7 +19,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_compute
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -31,7 +31,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_compute
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand Down
10 changes: 5 additions & 5 deletions molecule/test13/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_control
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -20,7 +20,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_login
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -33,7 +33,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_login
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -46,7 +46,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_compute
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -58,7 +58,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_compute
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand Down
6 changes: 3 additions & 3 deletions molecule/test14/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_login
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -19,7 +19,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_compute
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -31,7 +31,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_compute
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand Down
4 changes: 2 additions & 2 deletions molecule/test1b/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_login
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -21,7 +21,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_compute
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand Down
6 changes: 3 additions & 3 deletions molecule/test1c/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_login
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -19,7 +19,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_compute
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -31,7 +31,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_compute
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand Down
10 changes: 5 additions & 5 deletions molecule/test2/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ platforms:
pre_build_image: true
groups:
- testohpc_login
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -20,7 +20,7 @@ platforms:
groups:
- testohpc_compute
- testohpc_part1
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -33,7 +33,7 @@ platforms:
groups:
- testohpc_compute
- testohpc_part1
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -46,7 +46,7 @@ platforms:
groups:
- testohpc_compute
- testohpc_part2
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand All @@ -59,7 +59,7 @@ platforms:
groups:
- testohpc_compute
- testohpc_part2
command: /sbin/init
command: "/bin/bash -c 'dnf -y install systemd && /sbin/init'" # not in RL9 image
tmpfs:
- /run
- /tmp
Expand Down
Loading
Loading