From cfba0843cae7e72831db845b723f3262aa4b8e90 Mon Sep 17 00:00:00 2001 From: Austin Blatt Date: Mon, 10 Jun 2024 10:31:52 -0700 Subject: [PATCH] (maint) acceptance tests: always use released pdb module --- acceptance/helper.rb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/acceptance/helper.rb b/acceptance/helper.rb index 3101822259..1d7bd9a46d 100644 --- a/acceptance/helper.rb +++ b/acceptance/helper.rb @@ -441,15 +441,7 @@ def get_package_version(host, version = nil) end def install_puppetdb_module(hosts, puppet_platform) - if test_config[:install_mode] == :upgrade_oldest - # Use custom branch of puppetlabs-postgres for puppet 6 agents with gpg keys updated for last module release that was puppet 6 compatible - on(hosts, 'curl -L https://github.com/puppetlabs/puppetlabs-postgresql/archive/refs/heads/backport-gpg-key.tar.gz --output /tmp/puppetlabs-postgresql') - on(hosts, 'puppet module install /tmp/puppetlabs-postgresql') - on(hosts, 'puppet module install puppetlabs-puppetdb --version 7.13.0') - else - # While we sort out a new puppetlabs-puppetdb module release, point to a branch that allows us to take the latest puppetlabs-postgresql module - on(hosts, 'puppet module install puppetlabs-puppetdb') - end + on(hosts, 'puppet module install puppetlabs-puppetdb') end def install_puppetdb(host, version=nil)