Skip to content
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

(maint) acceptance tests: always use released pdb module #3983

Merged
merged 3 commits into from
Jun 11, 2024
Merged

(maint) acceptance tests: always use released pdb module #3983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18d827a
(maint) acceptance tests: pin module versions
austb Jun 10, 2024
6470a71
(maint) acceptance tests: manage rhel pgdg repo manually
austb Jun 11, 2024
7acc832
(docs) Add release notes for 7.19.0
austb Jun 11, 2024
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
26 changes: 15 additions & 11 deletions acceptance/helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,11 @@ def is_bullseye()
return test_config[:os_families].has_key? 'debian11-64-1'
end

def is_el7()
return test_config[:os_families].has_key?('redhat7-64-1') ||
test_config[:os_families].has_key?('centos7-64-1')
end

def is_el8()
return test_config[:os_families].has_key?('redhat8-64-1') ||
test_config[:os_families].has_key?('centos8-64-1')
Expand All @@ -305,6 +310,10 @@ def is_el9()
return test_config[:os_families].has_key?('redhat9-64-1')
end

def is_el()
is_el7 || is_el8 || is_el9
end

def is_rhel7fips
return test_config[:os_families].has_key? 'redhatfips7-64-1'
end
Expand Down Expand Up @@ -441,15 +450,8 @@ 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-postgresql --version 8.3.0')
on(hosts, 'puppet module install puppetlabs-puppetdb --version 7.14.0')
end

def install_puppetdb(host, version=nil)
Expand Down Expand Up @@ -545,8 +547,10 @@ def enable_https_apt_sources(host)
end

def postgres_manifest
# bionic is EOL, so its pgdg repo has been remove
manage_package_repo = ! is_bionic
# bionic is EOL, so its pgdg repo has been removed.
# For RedHat, the versions of the module that support upgrade_oldest
# tests from Puppet 6 configure the wrong GPG key
manage_package_repo = ! ( is_bionic || is_el )

manifest = <<-EOS
# create the puppetdb database
Expand Down
8 changes: 8 additions & 0 deletions acceptance/setup/pre_suite/40_install_deps.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@
on master, "dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm"
on master, "dnf -qy module disable postgresql"
end
elsif is_el7
step "Install PostgreSQL el7 repo" do
on master, "yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm"
end
elsif is_el9
step "Install PostgreSQL el8 repo" do
on master, "dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm"
end
elsif is_bionic
# bionic is EOL, so get postgresql from the archive
on master, 'echo "deb https://apt-archive.postgresql.org/pub/repos/apt bionic-pgdg main" >> /etc/apt/sources.list'
Expand Down
12 changes: 11 additions & 1 deletion documentation/release_notes_7.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@ canonical: "/puppetdb/latest/release_notes.html"

# PuppetDB: Release notes

## PuppetDB 7.19.0

Released June 11 2024

This release contains minor dependency upgrades.

### Contributors

Austin Blatt and Rob Browning.

## PuppetDB 7.18.0

Released April 11 2024
Expand All @@ -29,7 +39,7 @@ Released April 11 2024

### Contributors

Austin Blatt and Rob Browning.
Austin Blatt, Cas Donoghue, and Rob Browning.

## PuppetDB 7.17.1

Expand Down
Loading