Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ jobs:
- "el8"
- "el9"
- "ubuntu-2004"
- "ubuntu-2204"
puppet:
- "puppet6"
- "puppet7"
Expand Down
4 changes: 4 additions & 0 deletions .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Rakefile:
- el8
- el9
- ubuntu-2004
- ubuntu-2204
puppet:
- puppet6
- puppet7
Expand All @@ -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
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 2 additions & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"20.04"
"20.04",
"22.04"
]
}
],
Expand Down
25 changes: 25 additions & 0 deletions spec/acceptance/nodesets/ubuntu-2204.yml
Original file line number Diff line number Diff line change
@@ -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"]