Skip to content

Switch Debian builders to use OpenVox instead of Puppet #2431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evgeni merged 1 commit into from
Jun 12, 2026
+48 −63
Merged

Switch Debian builders to use OpenVox instead of Puppet #2431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 37 additions & 0 deletions puppet/modules/jenkins_node/files/pbuilder_F67-add-openvox-repos
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/bin/sh

. /etc/os-release
echo "deb http://apt.voxpupuli.org/ ${ID}${VERSION_ID} openvox8" >> /etc/apt/sources.list

cat > /etc/apt/trusted.gpg.d/openvox.asc <<EOF
-----BEGIN PGP PUBLIC KEY BLOCK-----

mQENBGeGidcBCADjJzn2Mh7E7guNotcwRh1vvKQkQrw/TYY+xuKA2DGOvMrVYzyn
BQ5CzQ3n2A4fyvUWhRqbgy2hV8uYQNap2ddJ05BlzH1WotUaLfHcAUmCxRIOYw89
nhi/5v+tZNjvAZo96E9fvYvWVnsYXVpYcG4xyGuQYdvEiBIrgxXM3M3XCgS3+Ns+
Hlm2FGZSxIYI0IOsbu34J5KDV/sAmBSAG7Oyg+hXGBAABWW97IQcZw0l260ksDHS
ea7Z0HcWmNgH6CjG2eR+WkGHJ7nVDxIr06SUgRr1xL66BrwYfD7rtURZJQWYPur4
D8G95js0Aisf2oUMHK0PRkq1hAUTBFXdE1P9ABEBAAG0IlZveCBQdXB1bGkgPG9w
ZW52b3hAdm94cHVwdWxpLm9yZz6JAVEEEwEIADsWIQQOJkKZhwAkGPlRPypfuZnC
1i/z2QUCZ4aJ1wIbAwULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRBfuZnC
1i/z2dLbCADcttMJyLG3TFax4FAzhNMwqM/Md7eWvDcAlhiXCbvQCNEsK97zumzV
v2EnTRwH7HWJeq/+5YMMKZh7BGKQb5BqKygBamF7EyzR8I3AfDqoKXhvs9yIDnVv
BuGO1uzLZCP/jdN/KBGbcQvU5u2Uxr3nB9VxPcQnBtg4e3uYWPDPqm9sfiOzLn5D
UFLiE1MyFkQER6BZO86QxsL+jQDbOnSCIIKTMd017rUBxNDV9713KMNerjRhB1UT
K73UfsKCHfc45xg0t3dQz7td/3fp7GyJafvT65ww9bTRoHLVFG/q3jOQ4b5pNAuz
YyhoaxkEPFLXD/uYahTG6YnKBZQnEU+9uQENBGeGidcBCADL6aKBBbYcNV+tqcq0
2wV6QluFwyfqCK6tRBMd9iMXa9JOLLncKf6ADMAfstSJ95IDzeJMQJrMAJ9Jq9/c
dGceEv7IHahyQ3LbDrz6S8cFyDXxJNlFvVu1+xbuDdVTlmBb69u34TpFenqsO6oO
TO7C9bK+pt3lZuiCmzgCgtsqHA38/M0BhtR/as4tTbnwR9FDj5xYH4WgKCIj4OqN
F2dmmdjmtHtnpNVGLCiFsfiCRxQGj4WzQnrXe60FXekV/MJBCnGGdttdyBkFFywb
cT6ceZCJJ9nbVborqkAZgipllwE4JG5rjNVsX1vraNtzvikfykANNRoSNf9ZC2ya
4O4dABEBAAGJATYEGAEIACAWIQQOJkKZhwAkGPlRPypfuZnC1i/z2QUCZ4aJ1wIb
DAAKCRBfuZnC1i/z2UZVCACCAvzs6VSVmQYeMilylNd3pAlY+LaVGrdCMbYZ4FBv
vMNhpTOzcV6y/9gcfP5NH5jSmbIQ6Lq82OBGgaag0gUvcY5AIFutuZAph9LPVfY8
kEqBCa8TqRAiWMzqYElbUvWMnY4pLL3+vlQViXPFuLk8MViEJ5jphGG3j4WDTgwC
al8R3f/kzwRYoJc9CK9LbZreqKVWFLVbxunyq8R/7nWxH/9jCUr6GbY0X1bQfc5M
laqQNoSXiDwb+K2CU+szqmwcuyxliV3arAQ/2a509l90H1VyNzBNmC42JxqgFAAT
8Dj43+HR+npsfqx1w78xgCtYYi1TU+S+tKpvKybylNP9
=vzYO
-----END PGP PUBLIC KEY BLOCK-----
EOF
58 changes: 0 additions & 58 deletions puppet/modules/jenkins_node/files/pbuilder_F67-add-puppet-repos
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion puppet/modules/jenkins_node/manifests/pbuilder_setup.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
Enum['present', 'absent'] $ensure = present,
Boolean $backports = false,
Boolean $nodesource = true,
Boolean $puppetlabs = true,
Boolean $puppetlabs = false,
Boolean $openvox = true,
) {
pbuilder { $name:
ensure => $ensure,
Expand Down Expand Up @@ -44,6 +45,7 @@
'F65-add-backport-repos' => $backports,
'F66-add-nodesource-nodistro-repos' => $nodesource,
'F67-add-puppet-repos' => $puppetlabs,
'F67-add-openvox-repos' => $openvox,
'F70aptupdate' => true,
'F99printrepos' => true,
}
Expand Down
12 changes: 8 additions & 4 deletions puppet/spec/classes/jenkins_node_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
it { is_expected.to contain_file('/etc/pbuilder/bookworm64/hooks/F60addforemanrepo').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/bookworm64/hooks/F65-add-backport-repos').with_ensure('absent') }
it { is_expected.to contain_file('/etc/pbuilder/bookworm64/hooks/F66-add-nodesource-nodistro-repos').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/bookworm64/hooks/F67-add-puppet-repos').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/bookworm64/hooks/F67-add-openvox-repos').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/bookworm64/hooks/F67-add-puppet-repos').with_ensure('absent') }
it { is_expected.to contain_file('/etc/pbuilder/bookworm64/hooks/F70aptupdate').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/bookworm64/hooks/F99printrepos').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/jammy64/hooks/A10nozstd').with_ensure('present') }
Expand All @@ -38,7 +39,8 @@
it { is_expected.to contain_file('/etc/pbuilder/noble64/hooks/F60addforemanrepo').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/noble64/hooks/F65-add-backport-repos').with_ensure('absent') }
it { is_expected.to contain_file('/etc/pbuilder/noble64/hooks/F66-add-nodesource-nodistro-repos').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/noble64/hooks/F67-add-puppet-repos').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/noble64/hooks/F67-add-openvox-repos').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/noble64/hooks/F67-add-puppet-repos').with_ensure('absent') }
it { is_expected.to contain_file('/etc/pbuilder/noble64/hooks/F70aptupdate').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/noble64/hooks/F99printrepos').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/resolute64/hooks/A10nozstd').with_ensure('absent') }
Expand All @@ -47,7 +49,8 @@
it { is_expected.to contain_file('/etc/pbuilder/resolute64/hooks/F60addforemanrepo').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/resolute64/hooks/F65-add-backport-repos').with_ensure('absent') }
it { is_expected.to contain_file('/etc/pbuilder/resolute64/hooks/F66-add-nodesource-nodistro-repos').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/resolute64/hooks/F67-add-puppet-repos').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/resolute64/hooks/F67-add-openvox-repos').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/resolute64/hooks/F67-add-puppet-repos').with_ensure('absent') }
it { is_expected.to contain_file('/etc/pbuilder/resolute64/hooks/F70aptupdate').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/resolute64/hooks/F99printrepos').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/trixie64/hooks/A10nozstd').with_ensure('absent') }
Expand All @@ -56,7 +59,8 @@
it { is_expected.to contain_file('/etc/pbuilder/trixie64/hooks/F60addforemanrepo').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/trixie64/hooks/F65-add-backport-repos').with_ensure('absent') }
it { is_expected.to contain_file('/etc/pbuilder/trixie64/hooks/F66-add-nodesource-nodistro-repos').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/trixie64/hooks/F67-add-puppet-repos').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/trixie64/hooks/F67-add-openvox-repos').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/trixie64/hooks/F67-add-puppet-repos').with_ensure('absent') }
it { is_expected.to contain_file('/etc/pbuilder/trixie64/hooks/F70aptupdate').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/trixie64/hooks/F99printrepos').with_ensure('present') }
end
Expand Down