diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a2dd46b..8b08238 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -55,6 +55,7 @@ jobs: - "el8" - "el9" - "ubuntu-2004" + - "ubuntu-2204" puppet: - "puppet6" - "puppet7" diff --git a/.sync.yml b/.sync.yml index cfb28d5..6ed1e49 100644 --- a/.sync.yml +++ b/.sync.yml @@ -11,6 +11,7 @@ Rakefile: - el8 - el9 - ubuntu-2004 + - ubuntu-2204 puppet: - puppet6 - puppet7 @@ -29,3 +30,6 @@ spec/acceptance/nodesets/ubuntu-1804.yml: spec/acceptance/nodesets/ubuntu-2004.yml: packages: - cron +spec/acceptance/nodesets/ubuntu-2204.yml: + packages: + - cron diff --git a/manifests/init.pp b/manifests/init.pp index 7162eea..440818c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -373,7 +373,7 @@ $osname = $facts.dig('os', 'name') $osmajor = $facts.dig('os', 'release', 'major') - $supported = ['RedHat-7','RedHat-8','RedHat-9','Debian-20.04'] + $supported = ['RedHat-7','RedHat-8','RedHat-9','Debian-20.04','Debian-22.04'] $os = "${osfamily}-${osmajor}" if ! ($os in $supported) { fail("Unsupported OS: module ${module_name}. osfamily=${osfamily} osmajor=${osmajor} detected") diff --git a/metadata.json b/metadata.json index 8f7a3cb..b1943c7 100644 --- a/metadata.json +++ b/metadata.json @@ -77,7 +77,8 @@ { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ - "20.04" + "20.04", + "22.04" ] } ], diff --git a/spec/acceptance/nodesets/ubuntu-2204.yml b/spec/acceptance/nodesets/ubuntu-2204.yml new file mode 100644 index 0000000..67574fd --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-2204.yml @@ -0,0 +1,25 @@ +HOSTS: + ubuntu2204: + roles: + - agent + platform: ubuntu-22.04-amd64 + hypervisor : docker + image: ubuntu:22.04 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - "rm -f /etc/dpkg/dpkg.cfg.d/excludes" + - 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates cron' + - 'locale-gen en_US.UTF-8' + docker_env: + - LANG=en_US.UTF-8 + - LANGUAGE=en_US.UTF-8 + - LC_ALL=en_US.UTF-8 + docker_container_name: 'openondemand-ubuntu2204' +CONFIG: + log_level: debug + type: foss +ssh: + password: root + auth_methods: ["password"] +