From 91e76bb480ae3538f94b517177f47a2d211bc39f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
Date: Thu, 18 Aug 2016 10:21:05 +0200
Subject: [PATCH] Use compose-utils to copy variants into public location
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This requires compose-utils >= 0.1.7.

Currently only primary architectures are composed based on this config.
Once other arches are added, they can be filtered with `--arch` option.

To debug what will happen when the command is run, add `--dry-run`. It
will print the exact rsync commands that would be used. Appending `--
--dry-run` at the end of the command will pass the option to rsync and
give different debugging information.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
 nightly.sh | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/nightly.sh b/nightly.sh
index 6fd75e6..26b8389 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -88,21 +88,24 @@ 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
 
-for dir in Everything Atomic CloudImages Docker Server Spins Workstation ;
-  do
-    $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/fedora/linux/development/$DIST/$dir/ --link-dest=/pub/fedora/linux/development/$DIST/Everything/ --exclude=repodata ;
-    $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/fedora/linux/development/$DIST/$dir/ --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
-  done
+$RSYNCPREFIX compose-partial-copy "$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/ \
+    --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/ \
+    --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/ \
+    --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"
 
-for dir in Cloud Labs ;
-  do
-    $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/alt/development/$DIST/$dir/ --link-dest=/pub/fedora/linux/development/$DIST/Everything/ --exclude=repodata ;
-    $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/alt/development/$DIST/$dir/ --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
-  done
 $RSYNCPREFIX rsync -avhH --delete-after $ATOMICREPO $ATOMICDEST
 
 # Tell interested persons that the rsync is done.