Update config for new updates and content URLs

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
This commit is contained in:
Peter Robinson 2019-02-06 19:48:15 +00:00
commit 4800c29ac2
2 changed files with 11 additions and 8 deletions

View file

@ -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",
],

View file

@ -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