diff --git a/metadata.json b/metadata.json index f3db3d4..a227ec1 100644 --- a/metadata.json +++ b/metadata.json @@ -40,8 +40,8 @@ ], "requirements": [ { - "name": "puppet", - "version_requirement": ">= 8.0.0 < 9.0.0" + "name": "openvox", + "version_requirement": ">= 8.19.0 < 9.0.0" } ], "tags": [ diff --git a/spec/setup_acceptance_node.pp b/spec/setup_acceptance_node.pp index b8ee435..fe747f1 100644 --- a/spec/setup_acceptance_node.pp +++ b/spec/setup_acceptance_node.pp @@ -1,40 +1,13 @@ # Bolt task acceptance test setup -# There are no packages for Debian 12 and Ubuntu 24.04 (noble) yet... -# Install puppet-tools from previous version in this case -case [$facts.get('os.name'), $facts.get('os.distro.release.major')] { - ['Debian', '12']: { - apt::source { 'puppet-tools-bullseye': - location => 'http://apt.puppet.com', - release => 'bullseye', - repos => 'puppet-tools', - key => { - 'source' => 'https://apt.puppet.com/keyring.gpg', - 'name' => 'puppet.gpg', - }, - before => Package['puppet-bolt'], - } - } - ['Ubuntu', '24.04']: { - apt::source { 'puppet-tools-jammy': - location => 'http://apt.puppet.com', - release => 'jammy', - repos => 'puppet-tools', - key => { - 'source' => 'https://apt.puppet.com/keyring.gpg', - 'name' => 'puppet.gpg', - }, - before => Package['puppet-bolt'], - } - } - default: {} -} +# We use aptly APT repository in acceptance tests +# Below is their GPG key ID +$aptly_gpg_key = 'EE727D4449467F0E' -package { ['puppet-bolt', 'gpg']: ensure => 'installed' } +# Install packages required +package { ['openbolt', 'gpg']: ensure => 'installed' } $puppetlabs_dir = '/root/.puppetlabs' -$aptly_gpg_key = 'EE727D4449467F0E' - $bolt_project = { modulepath => '/etc/puppetlabs/code/modules:/etc/puppetlabs/code/environments/production/modules', analytics => false, @@ -53,6 +26,7 @@ content => $bolt_project.stdlib::to_yaml, } +# Pre-import aptly APT repository GPG key to use in tests exec { 'import_aptly_gpg_key': path => '/bin:/sbin:/usr/bin:/usr/sbin', command => "gpg --no-default-keyring --keyring /root/keyring_for_tasks.gpg --keyserver keyserver.ubuntu.com --recv-keys ${aptly_gpg_key}",