Skip to content

Commit f10c47a

Browse files
evgenievgeni
committed
Switch Debian builders to use OpenVox instead of Puppet
1 parent dd25aff commit f10c47a

4 files changed

Lines changed: 48 additions & 63 deletions

File tree

‎puppet/modules/jenkins_node/files/pbuilder_F67-add-openvox-repos‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/sh
2+
3+
. /etc/os-release
4+
echo "deb https://apt.voxpupuli.org/ ${ID}${VERSION_ID} openvox8" >> /etc/apt/sources.list
5+
6+
cat > /etc/apt/trusted.gpg.d/openvox.asc <<EOF
7+
-----BEGIN PGP PUBLIC KEY BLOCK-----
8+
9+
mQENBGeGidcBCADjJzn2Mh7E7guNotcwRh1vvKQkQrw/TYY+xuKA2DGOvMrVYzyn
10+
BQ5CzQ3n2A4fyvUWhRqbgy2hV8uYQNap2ddJ05BlzH1WotUaLfHcAUmCxRIOYw89
11+
nhi/5v+tZNjvAZo96E9fvYvWVnsYXVpYcG4xyGuQYdvEiBIrgxXM3M3XCgS3+Ns+
12+
Hlm2FGZSxIYI0IOsbu34J5KDV/sAmBSAG7Oyg+hXGBAABWW97IQcZw0l260ksDHS
13+
ea7Z0HcWmNgH6CjG2eR+WkGHJ7nVDxIr06SUgRr1xL66BrwYfD7rtURZJQWYPur4
14+
D8G95js0Aisf2oUMHK0PRkq1hAUTBFXdE1P9ABEBAAG0IlZveCBQdXB1bGkgPG9w
15+
ZW52b3hAdm94cHVwdWxpLm9yZz6JAVEEEwEIADsWIQQOJkKZhwAkGPlRPypfuZnC
16+
1i/z2QUCZ4aJ1wIbAwULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRBfuZnC
17+
1i/z2dLbCADcttMJyLG3TFax4FAzhNMwqM/Md7eWvDcAlhiXCbvQCNEsK97zumzV
18+
v2EnTRwH7HWJeq/+5YMMKZh7BGKQb5BqKygBamF7EyzR8I3AfDqoKXhvs9yIDnVv
19+
BuGO1uzLZCP/jdN/KBGbcQvU5u2Uxr3nB9VxPcQnBtg4e3uYWPDPqm9sfiOzLn5D
20+
UFLiE1MyFkQER6BZO86QxsL+jQDbOnSCIIKTMd017rUBxNDV9713KMNerjRhB1UT
21+
K73UfsKCHfc45xg0t3dQz7td/3fp7GyJafvT65ww9bTRoHLVFG/q3jOQ4b5pNAuz
22+
YyhoaxkEPFLXD/uYahTG6YnKBZQnEU+9uQENBGeGidcBCADL6aKBBbYcNV+tqcq0
23+
2wV6QluFwyfqCK6tRBMd9iMXa9JOLLncKf6ADMAfstSJ95IDzeJMQJrMAJ9Jq9/c
24+
dGceEv7IHahyQ3LbDrz6S8cFyDXxJNlFvVu1+xbuDdVTlmBb69u34TpFenqsO6oO
25+
TO7C9bK+pt3lZuiCmzgCgtsqHA38/M0BhtR/as4tTbnwR9FDj5xYH4WgKCIj4OqN
26+
F2dmmdjmtHtnpNVGLCiFsfiCRxQGj4WzQnrXe60FXekV/MJBCnGGdttdyBkFFywb
27+
cT6ceZCJJ9nbVborqkAZgipllwE4JG5rjNVsX1vraNtzvikfykANNRoSNf9ZC2ya
28+
4O4dABEBAAGJATYEGAEIACAWIQQOJkKZhwAkGPlRPypfuZnC1i/z2QUCZ4aJ1wIb
29+
DAAKCRBfuZnC1i/z2UZVCACCAvzs6VSVmQYeMilylNd3pAlY+LaVGrdCMbYZ4FBv
30+
vMNhpTOzcV6y/9gcfP5NH5jSmbIQ6Lq82OBGgaag0gUvcY5AIFutuZAph9LPVfY8
31+
kEqBCa8TqRAiWMzqYElbUvWMnY4pLL3+vlQViXPFuLk8MViEJ5jphGG3j4WDTgwC
32+
al8R3f/kzwRYoJc9CK9LbZreqKVWFLVbxunyq8R/7nWxH/9jCUr6GbY0X1bQfc5M
33+
laqQNoSXiDwb+K2CU+szqmwcuyxliV3arAQ/2a509l90H1VyNzBNmC42JxqgFAAT
34+
8Dj43+HR+npsfqx1w78xgCtYYi1TU+S+tKpvKybylNP9
35+
=vzYO
36+
-----END PGP PUBLIC KEY BLOCK-----
37+
EOF

‎puppet/modules/jenkins_node/files/pbuilder_F67-add-puppet-repos‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎puppet/modules/jenkins_node/manifests/pbuilder_setup.pp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
Enum['present', 'absent'] $ensure = present,
99
Boolean $backports = false,
1010
Boolean $nodesource = true,
11-
Boolean $puppetlabs = true,
11+
Boolean $puppetlabs = false,
12+
Boolean $openvox = true,
1213
) {
1314
pbuilder { $name:
1415
ensure => $ensure,
@@ -44,6 +45,7 @@
4445
'F65-add-backport-repos' => $backports,
4546
'F66-add-nodesource-nodistro-repos' => $nodesource,
4647
'F67-add-puppet-repos' => $puppetlabs,
48+
'F67-add-openvox-repos' => $openvox,
4749
'F70aptupdate' => true,
4850
'F99printrepos' => true,
4951
}

‎puppet/spec/classes/jenkins_node_spec.rb‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
it { is_expected.to contain_file('/etc/pbuilder/bookworm64/hooks/F60addforemanrepo').with_ensure('present') }
2828
it { is_expected.to contain_file('/etc/pbuilder/bookworm64/hooks/F65-add-backport-repos').with_ensure('absent') }
2929
it { is_expected.to contain_file('/etc/pbuilder/bookworm64/hooks/F66-add-nodesource-nodistro-repos').with_ensure('present') }
30-
it { is_expected.to contain_file('/etc/pbuilder/bookworm64/hooks/F67-add-puppet-repos').with_ensure('present') }
30+
it { is_expected.to contain_file('/etc/pbuilder/bookworm64/hooks/F67-add-openvox-repos').with_ensure('present') }
31+
it { is_expected.to contain_file('/etc/pbuilder/bookworm64/hooks/F67-add-puppet-repos').with_ensure('absent') }
3132
it { is_expected.to contain_file('/etc/pbuilder/bookworm64/hooks/F70aptupdate').with_ensure('present') }
3233
it { is_expected.to contain_file('/etc/pbuilder/bookworm64/hooks/F99printrepos').with_ensure('present') }
3334
it { is_expected.to contain_file('/etc/pbuilder/jammy64/hooks/A10nozstd').with_ensure('present') }
@@ -38,7 +39,8 @@
3839
it { is_expected.to contain_file('/etc/pbuilder/noble64/hooks/F60addforemanrepo').with_ensure('present') }
3940
it { is_expected.to contain_file('/etc/pbuilder/noble64/hooks/F65-add-backport-repos').with_ensure('absent') }
4041
it { is_expected.to contain_file('/etc/pbuilder/noble64/hooks/F66-add-nodesource-nodistro-repos').with_ensure('present') }
41-
it { is_expected.to contain_file('/etc/pbuilder/noble64/hooks/F67-add-puppet-repos').with_ensure('present') }
42+
it { is_expected.to contain_file('/etc/pbuilder/noble64/hooks/F67-add-openvox-repos').with_ensure('present') }
43+
it { is_expected.to contain_file('/etc/pbuilder/noble64/hooks/F67-add-puppet-repos').with_ensure('absent') }
4244
it { is_expected.to contain_file('/etc/pbuilder/noble64/hooks/F70aptupdate').with_ensure('present') }
4345
it { is_expected.to contain_file('/etc/pbuilder/noble64/hooks/F99printrepos').with_ensure('present') }
4446
it { is_expected.to contain_file('/etc/pbuilder/resolute64/hooks/A10nozstd').with_ensure('absent') }
@@ -47,7 +49,8 @@
4749
it { is_expected.to contain_file('/etc/pbuilder/resolute64/hooks/F60addforemanrepo').with_ensure('present') }
4850
it { is_expected.to contain_file('/etc/pbuilder/resolute64/hooks/F65-add-backport-repos').with_ensure('absent') }
4951
it { is_expected.to contain_file('/etc/pbuilder/resolute64/hooks/F66-add-nodesource-nodistro-repos').with_ensure('present') }
50-
it { is_expected.to contain_file('/etc/pbuilder/resolute64/hooks/F67-add-puppet-repos').with_ensure('present') }
52+
it { is_expected.to contain_file('/etc/pbuilder/resolute64/hooks/F67-add-openvox-repos').with_ensure('present') }
53+
it { is_expected.to contain_file('/etc/pbuilder/resolute64/hooks/F67-add-puppet-repos').with_ensure('absent') }
5154
it { is_expected.to contain_file('/etc/pbuilder/resolute64/hooks/F70aptupdate').with_ensure('present') }
5255
it { is_expected.to contain_file('/etc/pbuilder/resolute64/hooks/F99printrepos').with_ensure('present') }
5356
it { is_expected.to contain_file('/etc/pbuilder/trixie64/hooks/A10nozstd').with_ensure('absent') }
@@ -56,7 +59,8 @@
5659
it { is_expected.to contain_file('/etc/pbuilder/trixie64/hooks/F60addforemanrepo').with_ensure('present') }
5760
it { is_expected.to contain_file('/etc/pbuilder/trixie64/hooks/F65-add-backport-repos').with_ensure('absent') }
5861
it { is_expected.to contain_file('/etc/pbuilder/trixie64/hooks/F66-add-nodesource-nodistro-repos').with_ensure('present') }
59-
it { is_expected.to contain_file('/etc/pbuilder/trixie64/hooks/F67-add-puppet-repos').with_ensure('present') }
62+
it { is_expected.to contain_file('/etc/pbuilder/trixie64/hooks/F67-add-openvox-repos').with_ensure('present') }
63+
it { is_expected.to contain_file('/etc/pbuilder/trixie64/hooks/F67-add-puppet-repos').with_ensure('absent') }
6064
it { is_expected.to contain_file('/etc/pbuilder/trixie64/hooks/F70aptupdate').with_ensure('present') }
6165
it { is_expected.to contain_file('/etc/pbuilder/trixie64/hooks/F99printrepos').with_ensure('present') }
6266
end

0 commit comments

Comments
 (0)