From ceac7427a05e5ea57e31c55c8615bd63b0c758fa Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Mar 10 2018 18:17:28 +0000
Subject: nightly.sh: Fixup syncing for Cloud/CloudImages change


Signed-off-by: Dusty Mabe <dusty@dustymabe.com>

---

diff --git a/nightly.sh b/nightly.sh
index 9e0a159..0ff5c3a 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -111,23 +111,23 @@ if [ ! -d "$RSYNCTARGET" ]; then
 fi
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
     "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --variant AtomicHost --variant CloudImages --variant Container \
+    --variant Everything --variant AtomicHost --variant Cloud --variant Container \
     --variant Server --variant Spins --variant Workstation --variant AtomicWorkstation --variant Modular \
     --link-dest="$RSYNCTARGET/Everything" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
     "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --variant AtomicHost --variant CloudImages --variant Container \
+    --variant Everything --variant AtomicHost --variant Cloud --variant Container \
     --variant Server --variant Spins --variant Workstation --variant AtomicWorkstation --variant Modular \
     --link-dest="$RSYNCTARGET/Everything" --delete-after
-# aarch64 for Everything Server CloudImages Container is primary
+# aarch64 for Everything Server Cloud Container is primary
 $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
     "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --variant Server --variant CloudImages --variant Container \
+    --variant Everything --variant Server --variant Cloud --variant Container \
     --variant Modular \
     --link-dest="$RSYNCTARGET/Everything" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
     "$DESTDIR" "$RSYNCTARGET/" \
-    --variant Everything --variant Server --variant CloudImages --variant Container \
+    --variant Everything --variant Server --variant Cloud --variant Container \
     --variant Modular \
     --link-dest="$RSYNCTARGET/Everything" --delete-after
 $RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"
@@ -139,11 +139,11 @@ if [ ! -d "$RSYNCALTTARGET" ]; then
 fi
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
     "$DESTDIR" "$RSYNCALTTARGET/" \
-    --variant Cloud --variant Labs \
+    --variant Labs \
     --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
     "$DESTDIR" "$RSYNCALTTARGET/" \
-    --variant Cloud --variant Labs \
+    --variant Labs \
     --link-dest="$RSYNCTARGET/Everything/" --delete-after
 $RSYNCPREFIX rm "$RSYNCALTTARGET/.composeinfo"
 $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCALTTARGET/" --name "$NEWCOMPOSE_ID"
@@ -154,22 +154,22 @@ if [ ! -d "$RSYNCSECTARGET" ]; then
 fi
 $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
     "$DESTDIR" "$RSYNCSECTARGET/" \
-    --variant AtomicHost --variant Cloud --variant CloudImages --variant Container \
+    --variant AtomicHost --variant Cloud --variant Container \
     --variant Labs --variant Spins --variant Workstation --variant Modular \
     --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
     "$DESTDIR" "$RSYNCSECTARGET/" \
-    --variant AtomicHost --variant Cloud --variant CloudImages --variant Container \
+    --variant AtomicHost --variant Cloud --variant Container \
     --variant Labs --variant Spins --variant Workstation --variant Modular \
     --link-dest="$RSYNCTARGET/Everything/" --delete-after
-# aarch64 is alternative for AtomicHost Cloud Labs Spins Workstation
+# aarch64 is alternative for AtomicHost Labs Spins Workstation
 $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
     "$DESTDIR" "$RSYNCSECTARGET/" \
-    --variant AtomicHost --variant Cloud --variant Labs --variant Spins --variant Workstation \
+    --variant AtomicHost --variant Labs --variant Spins --variant Workstation \
     --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
 $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
     "$DESTDIR" "$RSYNCSECTARGET/" \
-    --variant AtomicHost --variant Cloud --variant Labs --variant Spins --variant Workstation \
+    --variant AtomicHost --variant Labs --variant Spins --variant Workstation \
     --link-dest="$RSYNCTARGET/Everything/" --delete-after
 $RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"
 $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"