From d998f2ec5a8112265417991fa03c006c60a33cd5 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Aug 17 2020 20:50:31 +0000 Subject: Move aarch64 workstation rsync to primary, remove from alt. Signed-off-by: Paul Whalen --- diff --git a/nightly.sh b/nightly.sh index 3d1b9fc..1daa0fb 100755 --- a/nightly.sh +++ b/nightly.sh @@ -131,16 +131,16 @@ $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \ --variant Everything --variant Cloud --variant Container \ --variant Server --variant Spins --variant Workstation --variant Silverblue --variant Modular \ --link-dest="$RSYNCTARGET/Everything" --delete-after -# aarch64 for Everything Server Cloud Container is primary +# aarch64 for Everything Server Cloud Container Workstation is primary $RSYNCPREFIX compose-partial-copy --arch=aarch64 \ "$DESTDIR" "$RSYNCTARGET/" \ --variant Everything --variant Server --variant Cloud --variant Container \ - --variant Modular \ + --variant Modular --variant Workstation \ --link-dest="$RSYNCTARGET/Everything" --exclude=repodata $RSYNCPREFIX compose-partial-copy --arch=aarch64 \ "$DESTDIR" "$RSYNCTARGET/" \ --variant Everything --variant Server --variant Cloud --variant Container \ - --variant Modular \ + --variant Modular --variant Workstation \ --link-dest="$RSYNCTARGET/Everything" --delete-after $RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo" $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID" @@ -174,14 +174,14 @@ $RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \ --variant Everything --variant Cloud --variant Container \ --variant Labs --variant Server --variant Spins --variant Workstation --variant Modular \ --link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --delete-after -# aarch64 is alternative for Labs Spins Workstation +# aarch64 is alternative for Labs Spins $RSYNCPREFIX compose-partial-copy --arch=aarch64 \ "$DESTDIR" "$RSYNCSECTARGET/" \ - --variant Labs --variant Spins --variant Workstation \ + --variant Labs --variant Spins \ --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata $RSYNCPREFIX compose-partial-copy --arch=aarch64 \ "$DESTDIR" "$RSYNCSECTARGET/" \ - --variant Labs --variant Spins --variant Workstation \ + --variant Labs --variant Spins \ --link-dest="$RSYNCTARGET/Everything/" --delete-after $RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo" $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"