Skip to content

Commit 4722a11

Browse files
committed
Use Puppet 8 for repoclosure
Now that Foreman supports this, it's good to run with this. One big change is that puppet-agent 8.x no longer has a Provides: puppet line which otherwise we won't capture.
1 parent 36bf437 commit 4722a11

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

mock/el7.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ enabled=0
4646
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel7&arch=x86_64
4747
failovermethod=priority
4848
49-
[puppet-7]
50-
name=puppet-7
51-
baseurl=https://yum.puppetlabs.com/puppet7/el/7/x86_64/
49+
[puppet-8]
50+
name=puppet-8
51+
baseurl=https://yum.puppetlabs.com/puppet8/el/7/x86_64/
5252
"""

mock/el8.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ baseurl=https://yum.theforeman.org/plugins/nightly/el8/x86_64/
8585
name=katello
8686
baseurl=https://yum.theforeman.org/katello/nightly/katello/el8/x86_64/
8787
88-
[puppet-7]
89-
name=puppet-7
90-
baseurl=https://yum.puppetlabs.com/puppet7/el/8/x86_64/
88+
[puppet-8]
89+
name=puppet-8
90+
baseurl=https://yum.puppetlabs.com/puppet8/el/8/x86_64/
9191
"""

package_manifest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ all:
55
foreman_version: 'nightly'
66
katello_version: 'nightly'
77
candlepin_version: '4.4'
8-
puppet_version: 7
8+
puppet_version: 8
99
copr_project_user: "@theforeman"
1010
build_package_build_system: copr
1111
children:

repoclosure/yum.conf

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ name=CentOS Stream 9 - CRB
2828
metalink=https://mirrors.centos.org/metalink?repo=centos-crb-9-stream&arch=x86_64&protocol=https,http
2929
enabled=1
3030

31-
[el9-puppet-7]
32-
name=el9-puppet-7
33-
baseurl=https://yum.puppetlabs.com/puppet7/el/9/x86_64/
31+
[el9-puppet-8]
32+
name=el9-puppet-8
33+
baseurl=https://yum.puppetlabs.com/puppet8/el/9/x86_64/
3434

3535
[el9-foreman-client-nightly-staging]
3636
name=Foreman Client nightly EL9
@@ -71,9 +71,9 @@ mirrorlist=https://mirrors.almalinux.org/mirrorlist/8/powertools
7171
name=Foreman Client nightly EL8
7272
baseurl=https://stagingyum.theforeman.org/client/nightly/el8/x86_64/
7373

74-
[el8-puppet-7]
75-
name=el8-puppet-7
76-
baseurl=https://yum.puppetlabs.com/puppet7/el/8/x86_64/
74+
[el8-puppet-8]
75+
name=el8-puppet-8
76+
baseurl=https://yum.puppetlabs.com/puppet8/el/8/x86_64/
7777

7878
[el7-base]
7979
name=BaseOS
@@ -93,9 +93,9 @@ baseurl=https://vault.centos.org/centos/7/extras/x86_64/
9393
name=epel
9494
baseurl=https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/
9595

96-
[el7-puppet-7]
97-
name=el7-puppet-7
98-
baseurl=https://yum.puppetlabs.com/puppet7/el/7/x86_64/
96+
[el7-puppet-8]
97+
name=el7-puppet-8
98+
baseurl=https://yum.puppetlabs.com/puppet8/el/7/x86_64/
9999

100100
[el9-foreman-nightly-staging]
101101
name=Foreman nightly staging EL9

0 commit comments

Comments
 (0)