Skip to content

Commit 7bba14a

Browse files
committed
fix(opensuse): fix repo key parameter
Also, fix tests for the different RedHat's family members
1 parent b6a28fe commit 7bba14a

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

postgres/osfamilymap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ Suse:
145145
humanname: PostgreSQL {{ repo.version }} $releasever - $basearch
146146
# works for postgres 11 onwards
147147
baseurl: 'https://download.postgresql.org/pub/repos/zypp/{{ repo.version }}/suse/sles-$releasever-$basearch'
148-
key_url: 'https://download.postgresql.org/pub/repos/zypp/{{ repo.version }}/suse/sles-$releasever-$basearch/repodata/repomd.xml.key'
148+
gpgkey: 'https://download.postgresql.org/pub/repos/zypp/{{ repo.version }}/suse/sles-$releasever-$basearch/repodata/repomd.xml.key'
149149
gpgcheck: 1
150150
gpgautoimport: True
151151

test/integration/repo/controls/repository.rb

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
# frozen_string_literal: true
22

33
case platform.family
4-
when 'redhat'
4+
when 'redhat', 'fedora'
55
repo_file = '/etc/yum.repos.d/pgdg13.repo'
6-
repo_url = 'https://download.postgresql.org/pub/repos/yum/13/redhat/rhel-$releasever-$basearch'
6+
os_name_repo_url = {
7+
'amazon' => 'https://download.postgresql.org/pub/repos/yum/13/redhat/rhel-7-$basearch',
8+
'fedora' => 'https://download.postgresql.org/pub/repos/yum/13/fedora/fedora-$releasever-$basearch',
9+
'default' => 'https://download.postgresql.org/pub/repos/yum/13/redhat/rhel-$releasever-$basearch'
10+
}
11+
repo_url = os_name_repo_url[platform.name]
12+
713
when 'debian'
814
# Inspec does not provide a `codename` matcher, so we add ours
915
finger_codename = {

0 commit comments

Comments
 (0)