PR#578: nightly.sh: Fixup syncing for Cloud/CloudImages change - pungi-fedora

pungi-fedora

#578 nightly.sh: Fixup syncing for Cloud/CloudImages change

Merged 6 years ago by ausil. Opened 6 years ago by dustymabe.

dustymabe/pungi-fedora dusty-no-more-cloud-variant into master

nightly.sh: Fixup syncing for Cloud/CloudImages change

Dusty Mabe • 6 years ago

ceac742

nightly.sh

file modified

+12 -12

		`@@ -111,23 +111,23 @@`
		`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 @@`
		`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 @@`
		`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"`