Skip to content

Commit 5733324

Browse files
authored
Merge pull request #61 from voxpupuli/update-min-openvox-version-07f8cb2
Drop puppet, update openvox minimum version to 8.19
2 parents 8dde9e4 + b5ffb53 commit 5733324

2 files changed

Lines changed: 8 additions & 34 deletions

File tree

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
],
4141
"requirements": [
4242
{
43-
"name": "puppet",
44-
"version_requirement": ">= 8.0.0 < 9.0.0"
43+
"name": "openvox",
44+
"version_requirement": ">= 8.19.0 < 9.0.0"
4545
}
4646
],
4747
"tags": [

spec/setup_acceptance_node.pp

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,13 @@
11
# Bolt task acceptance test setup
22

3-
# There are no packages for Debian 12 and Ubuntu 24.04 (noble) yet...
4-
# Install puppet-tools from previous version in this case
5-
case [$facts.get('os.name'), $facts.get('os.distro.release.major')] {
6-
['Debian', '12']: {
7-
apt::source { 'puppet-tools-bullseye':
8-
location => 'http://apt.puppet.com',
9-
release => 'bullseye',
10-
repos => 'puppet-tools',
11-
key => {
12-
'source' => 'https://apt.puppet.com/keyring.gpg',
13-
'name' => 'puppet.gpg',
14-
},
15-
before => Package['puppet-bolt'],
16-
}
17-
}
18-
['Ubuntu', '24.04']: {
19-
apt::source { 'puppet-tools-jammy':
20-
location => 'http://apt.puppet.com',
21-
release => 'jammy',
22-
repos => 'puppet-tools',
23-
key => {
24-
'source' => 'https://apt.puppet.com/keyring.gpg',
25-
'name' => 'puppet.gpg',
26-
},
27-
before => Package['puppet-bolt'],
28-
}
29-
}
30-
default: {}
31-
}
3+
# We use aptly APT repository in acceptance tests
4+
# Below is their GPG key ID
5+
$aptly_gpg_key = 'EE727D4449467F0E'
326

33-
package { ['puppet-bolt', 'gpg']: ensure => 'installed' }
7+
# Install packages required
8+
package { ['openbolt', 'gpg']: ensure => 'installed' }
349

3510
$puppetlabs_dir = '/root/.puppetlabs'
36-
$aptly_gpg_key = 'EE727D4449467F0E'
37-
3811
$bolt_project = {
3912
modulepath => '/etc/puppetlabs/code/modules:/etc/puppetlabs/code/environments/production/modules',
4013
analytics => false,
@@ -53,6 +26,7 @@
5326
content => $bolt_project.stdlib::to_yaml,
5427
}
5528

29+
# Pre-import aptly APT repository GPG key to use in tests
5630
exec { 'import_aptly_gpg_key':
5731
path => '/bin:/sbin:/usr/bin:/usr/sbin',
5832
command => "gpg --no-default-keyring --keyring /root/keyring_for_tasks.gpg --keyserver keyserver.ubuntu.com --recv-keys ${aptly_gpg_key}",

0 commit comments

Comments
 (0)