PR#479: Update ostree repo url from atomic/repo/ to ostree/repo - fedora-kickstarts

fedora-kickstarts

#479 Update ostree repo url from atomic/repo/ to ostree/repo

Merged 5 years ago by puiterwijk. Opened 5 years ago by sinnykumari.

sinnykumari/fedora-kickstarts f29 into f29

Update ostree repo url from atomic/repo/ to ostree/repo

Sinny Kumari • 5 years ago

43a6635

file modified

+3 -3

		`@@ -2,14 +2,14 @@`
		`# ./fedora-atomic-testing-base.ks - for building media from the testing`
		`# refs (fedora/29/${basearch}/testing/atomic-host)`

		`- ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/repo/ --ref=fedora/29/${basearch}/testing/atomic-host`
		`+ ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/ostree/repo/ --ref=fedora/29/${basearch}/testing/atomic-host`

		`%post --erroronfail`
		`# Find the architecture we are on`
		`arch=$(uname -m)`
		`# Set the origin to the "main stable ref", distinct from /testing/ which is where bodhi writes.`
		`# We want consumers of this image to track the two week releases.`
		`- ostree admin set-origin --index 0 fedora-atomic https://dl.fedoraproject.org/atomic/repo/ "fedora/29/${arch}/atomic-host"`
		`+ ostree admin set-origin --index 0 fedora-atomic https://ostree.fedoraproject.org "fedora/29/${arch}/atomic-host"`

		`# Make sure the ref we're supposedly sitting on (according`
		`# to the updated origin) exists.`
		`@@ -22,6 +22,6 @@`
		`# delete/add the remote with new options to enable gpg verification`
		`# and to point them at the cdn url`
		`ostree remote delete fedora-atomic`
		`- ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary fedora-atomic 'https://dl.fedoraproject.org/atomic/repo/'`
		`+ ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist fedora-atomic 'https://ostree.fedoraproject.org'`

		`%end`

fedora-atomic-updates-base.ks

file modified

+3 -3

		`@@ -2,14 +2,14 @@`
		`# ./fedora-atomic-updates-base.ks - for building media from the updates`
		`# refs (fedora/29/${basearch}/updates/atomic-host)`

		`- ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/repo/ --ref=fedora/29/${basearch}/updates/atomic-host`
		`+ ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/ostree/repo/ --ref=fedora/29/${basearch}/updates/atomic-host`

		`%post --erroronfail`
		`# Find the architecture we are on`
		`arch=$(uname -m)`
		`# Set the origin to the "main stable ref", distinct from /updates/ which is where bodhi writes.`
		`# We want consumers of this image to track the two week releases.`
		`- ostree admin set-origin --index 0 fedora-atomic https://dl.fedoraproject.org/atomic/repo/ "fedora/29/${arch}/atomic-host"`
		`+ ostree admin set-origin --index 0 fedora-atomic https://ostree.fedoraproject.org "fedora/29/${arch}/atomic-host"`

		`# Make sure the ref we're supposedly sitting on (according`
		`# to the updated origin) exists.`
		`@@ -22,6 +22,6 @@`
		`# delete/add the remote with new options to enable gpg verification`
		`# and to point them at the cdn url`
		`ostree remote delete fedora-atomic`
		`- ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary fedora-atomic 'https://dl.fedoraproject.org/atomic/repo/'`
		`+ ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist fedora-atomic 'https://ostree.fedoraproject.org'`

		`%end`

fedora-atomic.ks

file modified

+2 -2

		`@@ -58,7 +58,7 @@`

		`# Equivalent of %include fedora-repo.ks`
		`# Pull from the ostree repo that was created during the compose`
		`- ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/repo/ --ref=fedora/29/${basearch}/atomic-host`
		`+ ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/ostree/repo/ --ref=fedora/29/${basearch}/atomic-host`

		`reboot`

		`@@ -68,7 +68,7 @@`
		`# This location is where the compose gets synced to after the compose`
		`# is done.`
		`ostree remote delete fedora-atomic`
		`- ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/repo/'`
		`+ ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist fedora-atomic 'https://ostree.fedoraproject.org'`

		`# older versions of livecd-tools do not follow "rootpw --lock" line above`
		`# https://bugzilla.redhat.com/show_bug.cgi?id=964299`

sinnykumari commented 5 years ago

Also update ostree remote url and set metalink=mirrolist
Related - https://pagure.io/fedora-infrastructure/issue7487

Signed-off-by: Sinny Kumari sinny@redhat.com

sinnykumari commented 5 years ago

Should be merged by either @dustymabe or @puiterwijk

dustymabe commented on line 14 of fedora-atomic-testing-base.ks 5 years ago

let's change the URL in this line to be https://ostree.fedoraproject.org
functionally this URL is never used, but I'd like for references to https://dl.fedoraproject.org/ostree/repo/ to go away.

rebased onto b3debed3a40e9f1e7cb2f3812279bae819bbd855

5 years ago

sinnykumari commented 5 years ago

Updated url from https://dl.fedoraproject.org/ostree/repo/ to https://ostree.fedoraproject.org in both fedora-atomic-testing-base.ks and fedora-atomic-updates-base.ks

dustymabe commented 5 years ago

LGTM - will merge when ready

rebased onto 43a6635

5 years ago