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
stackhpc · Feb 20, 2024 · 7f547d0 · 7f547d0
1 parent 1a6e941
commit 7f547d0
Show file tree

Hide file tree

Showing 23 changed files with 125 additions and 71 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,8 +7,7 @@ name: CI
  - master
 
 jobs:
-
- test:
+ molecule:
  name: Molecule
  # Workaround: systemd/kernel compatibility issue:
  # Failed to parse bus message: Invalid argument
@@ -24,7 +23,8 @@ jobs:
  fail-fast: false
  matrix:
  image:
- - 'rockylinux:8.8'
+ - 'rockylinux:8.9'
+ - 'rockylinux:9.3'
  scenario:
  - test1
  - test1b
@@ -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
@@ -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
@@ -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

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -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
@@ -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

diff --git a/molecule/README.md b/molecule/README.md
@@ -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:
 

diff --git a/molecule/test1/molecule.yml b/molecule/test1/molecule.yml
@@ -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
@@ -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
@@ -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

diff --git a/molecule/test10/molecule.yml b/molecule/test10/molecule.yml
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/molecule/test11/molecule.yml b/molecule/test11/molecule.yml
@@ -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
@@ -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
@@ -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

diff --git a/molecule/test12/molecule.yml b/molecule/test12/molecule.yml
@@ -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
@@ -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
@@ -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

diff --git a/molecule/test13/molecule.yml b/molecule/test13/molecule.yml
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/molecule/test14/molecule.yml b/molecule/test14/molecule.yml
@@ -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
@@ -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
@@ -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

diff --git a/molecule/test1b/molecule.yml b/molecule/test1b/molecule.yml
@@ -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
@@ -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

diff --git a/molecule/test1c/molecule.yml b/molecule/test1c/molecule.yml
@@ -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
@@ -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
@@ -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

diff --git a/molecule/test2/molecule.yml b/molecule/test2/molecule.yml
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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