Drop Debian 10, Add EL9, Debian 11, Ubuntu 22.04 (treydock#50)

Author: treydock

.github/workflows/ci.yaml

@@ -50,8 +50,10 @@ jobs:
         set:
           - "el7"
           - "el8"
-          - "debian-10"
+          - "el9"
+          - "debian-11"
           - "ubuntu-2004"
+          - "ubuntu-2204"
         puppet:
           - "puppet7"
           - "puppet8"

.sync.yml

@@ -4,9 +4,10 @@
     set:
       - el7
       - el8
-      - ---el9
-      - debian-10
+      - el9
+      - debian-11
       - ubuntu-2004
+      - ubuntu-2204
     puppet:
       - puppet7
       - puppet8
@@ -31,16 +32,16 @@ spec/acceptance/nodesets/el8.yml:
   packages:
     - crontabs
 spec/acceptance/nodesets/el9.yml:
-  delete: true
-spec/acceptance/nodesets/debian-9.yml:
-  delete: true
-spec/acceptance/nodesets/debian-10.yml:
   unmanaged: true
+  packages:
+    - crontabs
 spec/acceptance/nodesets/debian-11.yml:
-  delete: true
+  unmanaged: true
 spec/acceptance/nodesets/ubuntu-2004.yml:
   unmanaged: true
   packages:
     - cron
 spec/acceptance/nodesets/ubuntu-2204.yml:
-  delete: true
+  unmanaged: true
+  packages:
+    - cron

data/os/RedHat/9.yaml

@@ -0,0 +1,24 @@
+---
+slurm::source_dependencies:
+  - bzip2
+  - gcc
+  - make
+  - perl-devel
+  - munge-devel
+  - readline-devel
+  - numactl-devel
+  - pam-devel
+  - glib2-devel
+  - hwloc-devel
+  - openssl-devel
+  - curl-devel
+  - dbus-devel
+  - lz4-devel
+  - freeipmi-devel
+  - python3
+  - mariadb-devel
+  - libjwt-devel
+  - http-parser-devel
+  - json-c-devel
+  - libyaml-devel
+slurm::logrotate_syslog_pid_path: /var/run/rsyslogd.pid

data/os/Ubuntu/22.04.yaml

@@ -0,0 +1,3 @@
+---
+slurm::slurmdbd_db_charset: utf8mb3
+slurm::slurmdbd_db_collate: utf8mb3_general_ci

hiera.yaml

@@ -6,6 +6,8 @@ defaults:  # Used for any hierarchy level that omits these keys.
   data_hash: yaml_data  # Use the built-in YAML backend.
 
 hierarchy:
+  - name: 'os name major release'
+    path: "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
   - name: 'os family major release'
     path: "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
   - name: 'os family'

manifests/common/install/source.pp

@@ -18,7 +18,8 @@
   ($facts['os']['family'] == 'RedHat' and
   versioncmp($facts['os']['release']['major'], '8') >= 0) {
     if $slurm::source_install_manage_alternatives {
-      if $facts['os']['family'] == 'Debian' {
+      if $facts['os']['family'] == 'Debian' or
+      ($facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '9') >= 0) {
         alternative_entry { '/usr/bin/python3':
           ensure   => 'present',
           altlink  => '/usr/bin/python',

metadata.json

@@ -62,7 +62,8 @@
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
@@ -74,25 +75,28 @@
     {
       "operatingsystem": "Rocky",
       "operatingsystemrelease": [
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "AlmaLinux",
       "operatingsystemrelease": [
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "10"
+        "11"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "20.04"
+        "20.04",
+        "22.04"
       ]
     }
   ],
@@ -109,5 +113,5 @@
   ],
   "pdk-version": "2.7.1",
   "template-url": "https://github.com/treydock/pdk-templates.git#master",
-  "template-ref": "heads/master-0-g76f4dbb"
+  "template-ref": "heads/master-0-g52b1622"
 }

spec/acceptance/nodesets/debian-10.yml renamed to spec/acceptance/nodesets/debian-11.yml

@@ -7,20 +7,20 @@ HOSTS:
       - slurmdbd
       - slurmd
       - slurm-client
-    platform: debian-10-amd64
+    platform: debian-11-amd64
     hypervisor: docker
-    image: debian:10
+    image: debian:11
     docker_preserve_image: true
     docker_cmd:
       - '/sbin/init'
     docker_image_commands:
-      - 'apt-get install -y wget net-tools systemd-sysv locales apt-transport-https ca-certificates'
+      - 'apt-get install -y wget net-tools systemd-sysv locales apt-transport-https ca-certificates iproute2 cron'
       - 'echo "LC_ALL=en_US.UTF-8" >> /etc/environment'
       - 'echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen'
       - 'echo "LANG=en_US.UTF-8" > /etc/locale.conf'
       - 'locale-gen en_US.UTF-8'
     ip: 192.168.3.2
-    docker_container_name: 'slurm-debian10'
+    docker_container_name: 'slurm-debian11'
 CONFIG:
   log_level: debug
   type: foss

spec/acceptance/nodesets/el8.yml

@@ -16,7 +16,7 @@ HOSTS:
     docker_image_commands:
       - 'yum install -y dnf-utils'
       - 'dnf config-manager --set-enabled powertools'
-      - 'yum install -y tar wget iproute initscripts crontabs'
+      - 'yum install -y tar wget iproute initscripts crontabs langpacks-en glibc-all-langpacks glibc-langpack-en'
     ip: 192.168.2.2
     docker_container_name: 'slurm-el8'
 CONFIG:

spec/acceptance/nodesets/el9.yml

@@ -0,0 +1,24 @@
+HOSTS:
+  slurm:
+    roles:
+      - default
+      - agent
+      - slurmctld
+      - slurmdbd
+      - slurmd
+      - slurm-client
+    platform: el-9-x86_64
+    hypervisor: docker
+    image: rockylinux/rockylinux:9
+    docker_preserve_image: true
+    docker_cmd:
+      - '/usr/sbin/init'
+    docker_image_commands:
+      - 'yum install -y dnf-utils'
+      - 'dnf config-manager --set-enabled crb'
+      - 'yum install -y tar wget iproute initscripts crontabs langpacks-en glibc-all-langpacks glibc-langpack-en'
+    ip: 192.168.5.2
+    docker_container_name: 'slurm-el9'
+CONFIG:
+  log_level: debug
+  type: foss