Skip to content

Commit ea6dc78

Browse files
austbrbrw
authored andcommitted
(maint) test: get postgres from archive on debian 10
1 parent b4a2312 commit ea6dc78

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

acceptance/helper.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -528,8 +528,8 @@ def enable_https_apt_sources(host)
528528
end
529529

530530
def postgres_manifest
531-
# bionic is EOL, so its pgdg repo has been removed.
532-
manage_package_repo = ! is_bionic
531+
# For EOL OSes, pgdg removes the package repo
532+
manage_package_repo = ! (is_bionic || is_buster)
533533

534534
manifest = <<-EOS
535535
# create the puppetdb database

acceptance/setup/pre_suite/40_install_deps.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,14 @@
3232
on master, "dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm"
3333
on master, "dnf -qy module disable postgresql"
3434
end
35+
# these OSes are EOL, so get postgresql from the archive
3536
elsif is_bionic
36-
# bionic is EOL, so get postgresql from the archive
3737
on master, 'echo "deb https://apt-archive.postgresql.org/pub/repos/apt bionic-pgdg main" >> /etc/apt/sources.list'
3838
on master, 'curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -'
3939
on master, 'apt update'
40+
elsif is_buster
41+
on master, 'echo "deb https://apt-archive.postgresql.org/pub/repos/apt buster-pgdg main" >> /etc/apt/sources.list'
42+
on master, 'curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -'
43+
on master, 'apt update'
4044
end
4145
end

0 commit comments

Comments
 (0)