atomic: move to unified repo structure

We move to /compose/atomic/repo for the compose time repo and to
/atomic/repo for the production/user repo. See [1].

[1] https://lists.fedoraproject.org/archives/list/rel-eng@lists.fedoraproject.org/thread/KLN5L33BIR3ZEHC5RIG4NXGO7LT6HBXJ/

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
(cherry picked from commit 9fdd766e5d)
This commit is contained in:
Dusty Mabe 2018-03-03 12:31:14 -05:00
parent 473d9f3e85
commit 269b930193
No known key found for this signature in database
GPG Key ID: 3302DBD73952E671

View File

@ -58,7 +58,7 @@ logvol / --size=3000 --grow --fstype="xfs" --name=root --vgname=atomicos
# Equivalent of %include fedora-repo.ks # Equivalent of %include fedora-repo.ks
# Pull from the ostree repo that was created during the compose # 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/28/ --ref=fedora/28/${basearch}/atomic-host ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/repo/ --ref=fedora/28/${basearch}/atomic-host
reboot reboot
@ -68,7 +68,7 @@ reboot
# This location is where the compose gets synced to after the compose # This location is where the compose gets synced to after the compose
# is done. # is done.
ostree remote delete fedora-atomic ostree remote delete fedora-atomic
ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-28-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/28/' ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-28-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/repo/'
# older versions of livecd-tools do not follow "rootpw --lock" line above # older versions of livecd-tools do not follow "rootpw --lock" line above
# https://bugzilla.redhat.com/show_bug.cgi?id=964299 # https://bugzilla.redhat.com/show_bug.cgi?id=964299