From b833e1aa3990558422d5da1cfbf31f2cca4443d4 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: May 17 2016 16:41:27 +0000 Subject: update logic for secondary sync to primary mirror --- diff --git a/nightly.sh b/nightly.sh index fe36b85..7091a54 100755 --- a/nightly.sh +++ b/nightly.sh @@ -30,6 +30,17 @@ OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-/COMPOSE_ID) # uncomment and edit for resuming a failed compose #COMPOSE_ID="Fedora-23-20150530.n.0" +if [ "$ARCH" = "arm" ]; then + arches="aarch64" + variants="Everything Server Cloud CloudImages Docker" +elif [ "$ARCH" = "ppc" ]; then + arches="ppc64 ppc64le" + variants="Everything Server Cloud CloudImages Docker" +elif [ "$ARCH" = "s390" ]; then + arches="s390x" + variants="Everything Server" +fi + # assume a releng dir is a git checkout of teh releng repo # if it does not exist clone it if [ -d releng ]; then @@ -90,10 +101,13 @@ compose-changelog -p $TARGET_DIR/$NEWCOMPOSE_ID/logs/ $TARGET_DIR/$OLDCOMPOSE_ID } -for dir in Everything Server Cloud CloudImages Docker; +for a in $arches do - $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /mnt/koji/tree/development/$DIST/$dir/ --link-dest=/mnt/koji/tree/development/$DIST/Everything/ --exclude=repodata ; - $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /mnt/koji/tree/development/$DIST/$dir/ --link-dest=/mnt/koji/tree/development/$DIST/Everything/ --delete-after ; + for dir in $variants; + do + $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/$a/ /pub/fedora-secondary/development/$DIST/$dir/$a/ --link-dest=/pub/fedora-secondary/development/$DIST/Everything/ --exclude=repodata ; + $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/$a/ /pub/fedora-secondary/development/$DIST/$dir/$a/ --link-dest=/pub/fedora-secondary/development/$DIST/Everything/ --delete-after ; + done done SUBJECT='Fedora '$DIST' compose report: '$SHORTCOMPOSE_ID' changes'