From 4800c29ac2a6742fe3602f5c3d52d45fa1840696 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 6 Feb 2019 19:48:15 +0000 Subject: [PATCH] Update config for new updates and content URLs Signed-off-by: Peter Robinson --- fedora-iot.conf | 9 ++++++--- nightly.sh | 10 +++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index 4bd81e0..776709f 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -280,9 +280,10 @@ ostree_installer = [ "ostree-based-installer/lorax-embed-repo.tmpl"], "add_template_var": [ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ostree_update_repo=https://dl.fedoraproject.org/iot/repo/", + "ostree_update_repo=https://ostree.fedoraproject.org/iot/", "ostree_osname=fedora-iot", "ostree_oskey=fedora-iot-2019", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", "ostree_install_ref=fedora/devel/aarch64/iot", "ostree_update_ref=fedora/devel/aarch64/iot", ], @@ -299,9 +300,10 @@ ostree_installer = [ "ostree-based-installer/lorax-embed-repo.tmpl"], "add_template_var": [ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ostree_update_repo=https://dl.fedoraproject.org/iot/repo/", + "ostree_update_repo=https://ostree.fedoraproject.org/iot/", "ostree_osname=fedora-iot", "ostree_oskey=fedora-iot-2019", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", "ostree_install_ref=fedora/devel/armhfp/iot", "ostree_update_ref=fedora/devel/armhfp/iot", ], @@ -318,9 +320,10 @@ ostree_installer = [ "ostree-based-installer/lorax-embed-repo.tmpl"], "add_template_var": [ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ostree_update_repo=https://dl.fedoraproject.org/iot/repo/", + "ostree_update_repo=https://ostree.fedoraproject.org/iot/", "ostree_osname=fedora-iot", "ostree_oskey=fedora-iot-2019", + "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist", "ostree_install_ref=fedora/devel/x86_64/iot", "ostree_update_ref=fedora/devel/x86_64/iot", ], diff --git a/nightly.sh b/nightly.sh index fb3e8ee..02483a3 100755 --- a/nightly.sh +++ b/nightly.sh @@ -19,8 +19,8 @@ RSYNCPREFIX="sudo -u ftpsync" RSYNCTARGET="/pub/fedora/linux/development/$RELEASE" RSYNCALTTARGET="/pub/alt/development/$RELEASE" RSYNCSECTARGET="/pub/fedora-secondary/development/$RELEASE" -ATOMICSRCREPO="/mnt/koji/compose/atomic/repo/" -ATOMICDESTREPO="/mnt/koji/atomic/repo/" +OSTREESRCREPO="/mnt/koji/compose/atomic/repo/" +OSTREEDESTREPO="/mnt/koji/atomic/repo/" OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) # assume a releng dir is a git checkout of the releng repo @@ -88,12 +88,12 @@ chmod -R go+r $DESTDIR/compose/*/*/os/EFI/ # sync over atomic host/workstation to the unified ostree repo #for arch in x86_64 aarch64 ppc64le; do -# ostree pull-local --repo=$ATOMICDESTREPO $ATOMICSRCREPO --depth=-1 "fedora/30/${arch}/atomic-host" +# ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "fedora/30/${arch}/atomic-host" #done #for arch in x86_64; do -# ostree pull-local --repo=$ATOMICDESTREPO $ATOMICSRCREPO --depth=-1 "fedora/30/${arch}/workstation" +# ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "fedora/30/${arch}/workstation" #done -#ostree summary -u --repo=$ATOMICDESTREPO # update summary file +#ostree summary -u --repo=$OSTREEDESTREPO # update summary file # Tell interested persons that the rsync is done. #send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete