diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 1cdc23b7..9ffa5d4c 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -25,6 +25,8 @@ jobs: # - oraclelinux-7 - oraclelinux-8 - oraclelinux-9 + - rockylinux-8 + - rockylinux-9 - ubuntu-20.04 - ubuntu-22.04 - ubuntu-23.04 diff --git a/defaults/main.yml b/defaults/main.yml index e3a72c11..02ebf0eb 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -16,6 +16,8 @@ os_supported_matrix: min_version: "7" Fedora: min_version: "" + Rocky: + min_version: "" Amazon: min_version: "" # Debian based @@ -31,6 +33,9 @@ os_supported_matrix: ## Core nomad_debug: false +## Package configuration +nomad_curl_package: "{% if (ansible_distribution == 'AlmaLinux' and ansible_distribution_version is version('9', '>=')) %}curl-minimal{% else %}curl{% endif %}" + ## Asserts nomad_skip_ensure_all_hosts: "{{ lookup('env', 'NOMAD_SKIP_ENSURE_ALL_HOSTS') | default('false', true) }}" diff --git a/molecule/_shared/base.yml b/molecule/_shared/base.yml index 2bd58876..8fdeae82 100644 --- a/molecule/_shared/base.yml +++ b/molecule/_shared/base.yml @@ -30,5 +30,8 @@ provisioner: group_vars: nomad_instances: nomad_node_role: both + host_vars: + rockylinux-9: + nomad_curl_package: "curl-minimal" verifier: name: ansible diff --git a/molecule/rockylinux-8/molecule.yml b/molecule/rockylinux-8/molecule.yml new file mode 100644 index 00000000..89c37f50 --- /dev/null +++ b/molecule/rockylinux-8/molecule.yml @@ -0,0 +1,14 @@ +--- +platforms: + - name: rockylinux-8 + groups: + - nomad_instances + image: rockylinux:8 + dockerfile: ../_shared/Dockerfile.j2 + capabilities: + - SYS_ADMIN + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + privileged: true + command: /usr/lib/systemd/systemd diff --git a/molecule/rockylinux-8/verify.yml b/molecule/rockylinux-8/verify.yml new file mode 120000 index 00000000..420d51df --- /dev/null +++ b/molecule/rockylinux-8/verify.yml @@ -0,0 +1 @@ +../_shared/verify.yml \ No newline at end of file diff --git a/molecule/rockylinux-9/molecule.yml b/molecule/rockylinux-9/molecule.yml new file mode 100644 index 00000000..d6737236 --- /dev/null +++ b/molecule/rockylinux-9/molecule.yml @@ -0,0 +1,14 @@ +--- +platforms: + - name: rockylinux-9 + groups: + - nomad_instances + image: rockylinux:9 + dockerfile: ../_shared/Dockerfile.j2 + capabilities: + - SYS_ADMIN + cgroupns_mode: host + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw + privileged: true + command: /usr/lib/systemd/systemd diff --git a/molecule/rockylinux-9/verify.yml b/molecule/rockylinux-9/verify.yml new file mode 120000 index 00000000..420d51df --- /dev/null +++ b/molecule/rockylinux-9/verify.yml @@ -0,0 +1 @@ +../_shared/verify.yml \ No newline at end of file diff --git a/vars/RedHat.yml b/vars/RedHat.yml index 115f8929..70499ced 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -2,7 +2,7 @@ # File: vars/RedHat.yml - Red Hat OS variables for Nomad nomad_os_packages: - - "{% if (ansible_distribution == 'AlmaLinux' and ansible_distribution_version is version('9', '>=')) %}curl-minimal{% else %}curl{% endif %}" + - "{{ nomad_curl_package }}" - git - "{% if (ansible_distribution == 'Fedora' and ansible_distribution_version is version('28', '<')) or (ansible_distribution == 'CentOS' and ansible_distribution_version is version('8', '<')) or (ansible_distribution == 'Amazon' and ansible_distribution_version is version('3', '<')) or (ansible_distribution == 'OracleLinux' and