nightly.sh: update the syncing of composes

Sync the new Modular variant, 	primary aarch64, armhfp, x86_64
				alt: i386, ppc64, ppc64le, s390x
rename the syncing from Docker to Container for recent change

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2018-02-20 16:13:30 -06:00
parent 368fa1ff32
commit 1bc7668da7

View File

@ -117,20 +117,24 @@ if [ ! -d "$RSYNCTARGET" ]; then
fi
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
"$DESTDIR" "$RSYNCTARGET/" \
--variant Everything --variant Atomic --variant CloudImages --variant Docker --variant Server --variant Spins --variant Workstation \
--variant Everything --variant Atomic --variant CloudImages --variant Container \
--variant Server --variant Spins --variant Workstation --variant Modular \
--link-dest="$RSYNCTARGET/Everything" --exclude=repodata
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
"$DESTDIR" "$RSYNCTARGET/" \
--variant Everything --variant Atomic --variant CloudImages --variant Docker --variant Server --variant Spins --variant Workstation \
--variant Everything --variant Atomic --variant CloudImages --variant Container \
--variant Server --variant Spins --variant Workstation --variant Modular \
--link-dest="$RSYNCTARGET/Everything" --delete-after
# aarch64 for Server and Everything is primary
$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
"$DESTDIR" "$RSYNCTARGET/" \
--variant Everything --variant Server --variant CloudImages --variant Docker \
--variant Everything --variant Server --variant CloudImages --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 Docker \
--variant Everything --variant Server --variant CloudImages --variant Container \
--variant Modular \
--link-dest="$RSYNCTARGET/Everything" --delete-after
$RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"
$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID"
@ -163,11 +167,13 @@ $RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch
# aarch64 is alternative for Atomic Labs Spins Workstation
$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
"$DESTDIR" "$RSYNCSECTARGET/" \
--variant Atomic --variant Cloud --variant CloudImages --variant Docker --variant Labs --variant Spins --variant Workstation \
--variant Atomic --variant Cloud --variant CloudImages --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 Atomic --variant Cloud --variant CloudImages --variant Docker --variant Labs --variant Spins --variant Workstation \
--variant Atomic --variant Cloud --variant CloudImages --variant Container \
--variant Labs --variant Spins --variant Workstation --variant Modular \
--link-dest="$RSYNCTARGET/Everything/" --delete-after
$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
"$DESTDIR" "$RSYNCSECTARGET/" \