From b5f49e67a8a0798b62fb5b3cf10b444f3da54743 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Aug 26 2015 04:37:04 +0000
Subject: clean up some extra lines,  fix up urls, and make sure we sync the Atomic installer


Signed-off-by: Dennis Gilmore <dennis@ausil.us>

---

diff --git a/scripts/make-updates b/scripts/make-updates
index 9112478..cd86339 100755
--- a/scripts/make-updates
+++ b/scripts/make-updates
@@ -43,52 +43,25 @@ do
 done
 
 
-## XXX inject lorax code here for atomic iso creation
-## NOTE: <dgilmore> masta: ./make-updates 21 updates 20150309
-##
-
-# fixup the kickstart files so lorax is happy
-sed -i -e 's|repo --name=fedora .*$|repo --name=fedora --baseurl=http://kojipkgs.fedoraproject.org/mash/branched/$basearch/os/ \nrepo --name=bleed --baseurl=http://kojipkgs.fedoraproject.org/mash/bleed/$basearch|g' fedora-install-*.ks
-sed -i -e 's|repo --name=fedora-source .*$|repo --name=fedora-source  --baseurl=http://kojipkgs.fedoraproject.org/mash/branched/source/SRPMS/\nrepo --name=bleed-source --baseurl=http://kojipkgs.fedoraproject.org/mash/bleed/SRPMS|g' fedora-install-*.ks
-
-pushd
 
 # use the latest updated kickstarts
 pushd $ATOMIC
 git reset --hard
+git checkout f$VERSION 
 git pull --rebase
 
-# Generate the bleed repo
-cat <<EOF >fedora-bleed.repo
-[fedora-bleed]
-name=fedora-bleed
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${VERSION}-\$basearch
-enabled=1
-baseurl=http://kojipkgs.fedoraproject.org/mash/bleed/\$basearch/
-EOF
-
-# Replace mirrorlist (if present) with baseurl
-sed -i -e "s|mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-${VERSION}&arch=\$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/branched/\$basearch/os/|g" fedora*repo
-
-# Append the fedora-=bleed repo
-sed -i -e "s|\[\"\(fedora-${VERSION}\)\"\]|\[\"\1\", \"fedora-bleed\"\]|g" *json
-
 mock -r fedora-branched-compose-x86_64 --init || exit 1
-mock -r fedora-branched-compose-x86_64 --install rpm-ostree lorax || exit 1
-mock -r fedora-branched-compose-x86_64  --shell "if [ ! -d "$ATOMICDEST" ]; then ostree init --repo=${ATOMICDEST} --mode=archive-z2;fi"
-mock -r fedora-branched-compose-x86_64 --shell "rpm-ostree compose tree --repo=${ATOMICDEST} ${ATOMIC}/fedora-atomic-docker-host.json" || exit 1
+mock -r fedora-branched-compose-x86_64 --install lorax || exit 1
 mock -r fedora-branched-compose-x86_64 --shell "mkdir -p ${DESTDIR}/${VERSION}/Cloud_Atomic/x86_64/iso"
 mock -r fedora-branched-compose-x86_64 --shell "lorax --nomacboot -p Fedora -v ${SHORTVERSION} -r ${SHORTCOMPOSE} \
-                                                 -s http://kojipkgs.fedoraproject.org/mash/branched/x86_64/os/ \
-                                                 -s http://kojipkgs.fedoraproject.org/mash/bleed/x86_64/ \
+                                                 -s http://infrastructure.fedoraproject.org/pub/alt/releases/$VERSION/Cloud/\$arch/os/ \
                                                  -i fedora-productimg-atomic \
                                                  -t Cloud_Atomic \
                                                  --tmp /tmp/ \
                                                  --logfile=${DESTDIR}/logs/atomic \
                                                  --add-template /srv/pungi/spin-kickstarts/atomic-installer/lorax-configure-repo.tmpl \
                                                  --add-template-var=ostree_osname=fedora-atomic \
-                                                 --add-arch-template-var=ostree_repo=http://compose-x86-01.phx2.fedoraproject.org/compose/atomic/ \
+                                                 --add-arch-template-var=ostree_repo=https://kojipkgs.fedoraproject.org/mash/atomic/$VERSION/ \
                                                  --add-template-var=ostree_ref=fedora-atomic/f${VERSION}/x86_64/docker-host \
                                                  --add-arch-template /srv/pungi/spin-kickstarts/atomic-installer/lorax-embed-repo.tmpl \
                                                  --add-arch-template-var=ostree_osname=fedora-atomic \
@@ -98,7 +71,6 @@ mock -r fedora-branched-compose-x86_64 --shell "cp -l ${DESTDIR}/${VERSION}/Clou
 mock -r fedora-branched-compose-x86_64 --shell "pushd ${DESTDIR}/${VERSION}/Cloud_Atomic/x86_64/iso/ ;sha256sum -b --tag *iso >Fedora-Cloud_Atomic-${VERSION}-x86_64-CHECKSUM; popd" || exit 1
 
 popd
-## XXX End of lorax injection
 
 sg releng "mkdir -p $FINALDEST"
 pushd $FINALDEST/
@@ -129,6 +101,6 @@ popd
 # stage the composed tree to final locateion
 sg releng "mkdir /pub/alt/stage/$VERSION-$DATE/"
 sg releng "chmod 700 /pub/alt/stage/$VERSION-$DATE/"
-for type in Docker Cloud-Images; do sg releng "rsync -avhH $FINALDEST/$type/ /pub/alt/stage/$VERSION-$DATE/$type/"; done
+for type in Cloud_Atomic Docker Cloud-Images; do sg releng "rsync -avhH $FINALDEST/$type/ /pub/alt/stage/$VERSION-$DATE/$type/"; done
 sg releng "chmod 755 /pub/alt/stage/$VERSION-$DATE/"