Merge branch 'master' into feat/no-ohpc

Author: sjpb

.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

defaults/main.yml

@@ -14,6 +14,7 @@ openhpc_job_maxtime: '60-0' # quote this to avoid ansible converting some format
 openhpc_config: "{{ openhpc_extra_config | default({}) }}"
 openhpc_gres_template: gres.conf.j2
 openhpc_slurm_configless: "{{ 'enable_configless' in openhpc_config.get('SlurmctldParameters', []) }}"
+
 openhpc_state_save_location: /var/spool/slurm
 openhpc_slurmd_spool_dir: /var/spool/slurm
 openhpc_slurm_conf_path: /etc/slurm/slurm.conf
@@ -68,6 +69,19 @@ openhpc_lib_dir: /usr/lib64/slurm # path to slurm libraries
 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
@@ -81,6 +95,16 @@ ohpc_openhpc_repos:
       baseurl: "http://repos.openhpc.community/OpenHPC/2/updates/CentOS_8"
       gpgcheck: true
       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
       description: "Extra Packages for Enterprise Linux 8 - $basearch"

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:
 

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

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

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

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

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

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

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