Merge pull request #47 from grycap/devel

Add ubuntu 24 tests
grycap · Jul 22, 2024 · acd0e98 · acd0e98
2 parents a130ba4 + 639684d
commit acd0e98
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -21,10 +21,10 @@ jobs:
     strategy:
       matrix:
         distro:
-          - centos8
+          - rockylinux8
           - rockylinux9
-          - ubuntu2004
           - ubuntu2204
+          - ubuntu2404
           - debian11
 
     steps:

diff --git a/molecule/cluster/converge.yml b/molecule/cluster/converge.yml
@@ -18,6 +18,6 @@
         max_number_of_nodes: 1
         drmaa_lib_install: true
         drmaa_lib_version: 1.1.4
-        slurm_version: 23.11.1
+        slurm_version: 23.11.8
         add_extra_hosts: false
 
diff --git a/molecule/cluster/molecule.yml b/molecule/cluster/molecule.yml
@@ -18,7 +18,7 @@ verifier:
   name: ansible
 platforms:
   - name: slurmserver
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2204}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw

diff --git a/tasks/Debian.yaml b/tasks/Debian.yaml
@@ -19,22 +19,22 @@
         - name: Install common slurm-smd packages
           apt:
             name:
-              - slurm-smd
-              - slurm-smd-client
+              - slurm-smd={{ slurm_version }}*
+              - slurm-smd-client={{ slurm_version }}*
 
         - name: Install front slurm-smd packages
           apt:
-            name: slurm-smd-slurmctld
+            name: slurm-smd-slurmctld={{ slurm_version }}*
           when: slurm_type_of_node == "front"
 
         - name: Install wn slurm-smd packages
           apt:
-            name: slurm-smd-slurmd
+            name: slurm-smd-slurmd={{ slurm_version }}*
           when: slurm_type_of_node == "wn"
 
         - name: Install wn slurm-smd-dev package
           apt:
-            name: slurm-smd-dev
+            name: slurm-smd-dev={{ slurm_version }}*
           when: drmaa_lib_install
 
         when: slurm_version is version('23.11.0', '>=')

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -54,6 +54,11 @@
   - name: Include "{{slurm_type_of_node}}" SLURM recipe
     include_tasks: "{{slurm_type_of_node}}.yaml"
 
+  - name: Define the DRMAA library version as it does not work with SLURM 24
+    set_fact:
+      drmaa_lib_install: false
+    when: slurm_version is version('24.0.0', '>=')
+
   - name: Install DRMAA Lib
     include_tasks: drmaa.yml
     when: drmaa_lib_install