From 5738b3d3c1641c4a8c986e40372cd2bf2d9f823f Mon Sep 17 00:00:00 2001 From: Jon Disnard Date: Aug 25 2015 01:30:29 +0000 Subject: Initial Atomic installer ISO support in make-updates --- diff --git a/scripts/make-updates b/scripts/make-updates index 258b3b0..9112478 100755 --- a/scripts/make-updates +++ b/scripts/make-updates @@ -42,6 +42,64 @@ do fi done + +## XXX inject lorax code here for atomic iso creation +## NOTE: 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 pull --rebase + +# Generate the bleed repo +cat <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 --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/ \ + -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-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 \ + --add-arch-template-var=ostree_ref=fedora-atomic/f${VERSION}/x86_64/docker-host \ + ${DESTDIR}/${VERSION}/Cloud_Atomic/x86_64/os/ " || exit 1 +mock -r fedora-branched-compose-x86_64 --shell "cp -l ${DESTDIR}/${VERSION}/Cloud_Atomic/x86_64/os/images/boot.iso ${DESTDIR}/${VERSION}/Cloud_Atomic/x86_64/iso/Fedora-Cloud_Atomic-x86_64-${VERSION}.iso" || exit 1 +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/ sg releng "mkdir -p Cloud-Images/i386/Images Cloud-Images/x86_64/Images Docker/x86_64"