Skip to content

Commit 1d12a4e

Browse files
committed
add ubuntu 24.04 support
1 parent d172e85 commit 1d12a4e

File tree

4 files changed

+41
-2
lines changed

4 files changed

+41
-2
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM puppet/pdk:latest
1+
FROM docker.io/puppet/pdk:latest
22

33
# [Optional] Uncomment this section to install additional packages.
44
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

metadata.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
"operatingsystemrelease": [
2727
"18.04",
2828
"20.04",
29-
"22.04"
29+
"22.04",
30+
"24.04"
3031
]
3132
}
3233
],

provision.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ docker_ub_6:
1818
images:
1919
- litmusimage/ubuntu:18.04
2020
- litmusimage/ubuntu:20.04
21+
- litmusimage/ubuntu:22.04
22+
- litmusimage/ubuntu:24.04
2123
docker_el7:
2224
provisioner: docker
2325
images: []
@@ -28,10 +30,14 @@ release_checks_6:
2830
- debian-10-x86_64
2931
- ubuntu-1804-x86_64
3032
- ubuntu-2004-x86_64
33+
- ubuntu-2204-x86_64
34+
- ubuntu-2404-x86_64
3135
release_checks_7:
3236
provisioner: abs
3337
images:
3438
- debian-9-x86_64
3539
- debian-10-x86_64
3640
- ubuntu-1804-x86_64
3741
- ubuntu-2004-x86_64
42+
- ubuntu-2204-x86_64
43+
- ubuntu-2404-x86_64

spec/classes/apt_backports_spec.rb

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,38 @@
7171
}
7272
end
7373

74+
context 'with defaults on ubuntu 24.04' do
75+
let(:facts) do
76+
{
77+
os: {
78+
family: 'Debian',
79+
name: 'Ubuntu',
80+
release: {
81+
major: '24.04',
82+
full: '24.04'
83+
},
84+
distro: {
85+
codename: 'noble',
86+
id: 'Ubuntu'
87+
}
88+
}
89+
}
90+
end
91+
92+
it {
93+
expect(subject).to contain_apt__source('backports').with(
94+
location: 'http://archive.ubuntu.com/ubuntu',
95+
repos: 'main universe multiverse restricted',
96+
release: 'noble-backports',
97+
pin: {
98+
'priority' => 200,
99+
'release' => 'noble-backports'
100+
},
101+
keyring: '/usr/share/keyrings/ubuntu-archive-keyring.gpg',
102+
)
103+
}
104+
end
105+
74106
context 'with everything set' do
75107
let(:facts) do
76108
{

0 commit comments

Comments
 (0)