From 9161baf28141fe6c79db3a36f41640d59c1573ea Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sep 14 2016 03:09:23 +0000 Subject: sync the content to different locations aarch64 and i386 to fedora-secondary armhfp and x86_64 to alt for Cloud and Labs everything else to /pub/fedora Signed-off-by: Dennis Gilmore --- diff --git a/nightly.sh b/nightly.sh index 2559921..14bd7cf 100755 --- a/nightly.sh +++ b/nightly.sh @@ -88,24 +88,40 @@ ostree prune --repo=$ATOMICREPO --keep-younger-than="14 days ago" --refs-only # Tell interested persons that the rsync is starting (zomg!) send_fedmsg "${fedmsg_json_start}" ${DIST} rsync.start -$RSYNCPREFIX compose-partial-copy "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/fedora/linux/development/$DIST/ \ +# Sync the content to /pub/fedora +$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \ + "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/fedora/linux/development/$DIST/ \ --variant Everything --variant Atomic --variant CloudImages --variant Docker --variant Server --variant Spins --variant Workstation \ --link-dest=/pub/fedora/linux/development/$DIST/Everything --exclude=repodata -$RSYNCPREFIX compose-partial-copy "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/fedora/linux/development/$DIST/ \ +$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \ + "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/fedora/linux/development/$DIST/ \ --variant Everything --variant Atomic --variant CloudImages --variant Docker --variant Server --variant Spins --variant Workstation \ --link-dest=/pub/fedora/linux/development/$DIST/Everything --delete-after $RSYNCPREFIX rm /pub/fedora/linux/development/$DIST/.composeinfo $RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/fedora/linux/development/$DIST/ --name "$NEWCOMPOSE_ID" -$RSYNCPREFIX compose-partial-copy "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/alt/development/$DIST/ \ +# Sync the content to /pub/alt +$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \ + "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/alt/development/$DIST/ \ --variant Cloud --variant Labs \ --link-dest=/pub/fedora/linux/development/$DIST/Everything/ --exclude=repodata -$RSYNCPREFIX compose-partial-copy "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/alt/development/$DIST/ \ +$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \ + "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/alt/development/$DIST/ \ --variant Cloud --variant Labs \ --link-dest=/pub/fedora/linux/development/$DIST/Everything/ --delete-after $RSYNCPREFIX rm /pub/alt/development/$DIST/.composeinfo $RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/alt/development/$DIST/ --name "$NEWCOMPOSE_ID" +# Sync the content to /pub/fedora-secondary +$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=i386 \ + "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/fedora-secondary/development/$DIST/ \ + --link-dest=/pub/fedora/linux/development/$DIST/Everything/ --exclude=repodata +$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=i386 \ + "$TARGET_DIR/$NEWCOMPOSE_ID" /pub/fedora-secondary/development/$DIST/ \ + --link-dest=/pub/fedora/linux/development/$DIST/Everything/ --delete-after +$RSYNCPREFIX rm /pub/alt/development/$DIST/.composeinfo +$RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/alt/development/$DIST/ --name "$NEWCOMPOSE_ID" + $RSYNCPREFIX rsync -avhH --delete-after $ATOMICREPO $ATOMICDEST # Tell interested persons that the rsync is done.