nightly: variables to define the alt and secondary rsync targets

As an earlier commit did for the primary rsync target location,
define variables for the alt and secondary target locations for
nightly composes.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-01-25 12:19:16 +01:00
parent e82a95813c
commit 1a0a6bc08e

View File

@ -19,6 +19,8 @@ TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
FROM="Fedora Rawhide Report <rawhide@fedoraproject.org>"
RSYNCPREFIX="sudo -u ftpsync"
RSYNCTARGET="/pub/fedora/linux/development/$RELEASE"
RSYNCALTTARGET="/pub/alt/development/$RELEASE"
RSYNCSECTARGET="/pub/fedora-secondary/development/$RELEASE"
ATOMIC=$(mktemp -d /tmp/atomic.${RELEASE}.$DATE.XXXX)
ATOMICHOSTREPO="/mnt/koji/compose/atomic/$RELEASE/"
ATOMICWSREPO="/mnt/koji/compose/ostree/$RELEASE/"
@ -121,32 +123,32 @@ $RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"
$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID"
# Sync the content to /pub/alt
if [ ! -d /pub/alt/development/$RELEASE ]; then
mkdir /pub/alt/development/$RELEASE
if [ ! -d "$RSYNCALTTARGET" ]; then
mkdir "$RSYNCALTTARGET"
fi
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
"$DESTDIR" /pub/alt/development/$RELEASE/ \
"$DESTDIR" "$RSYNCALTTARGET/" \
--variant Cloud --variant Labs \
--link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
"$DESTDIR" /pub/alt/development/$RELEASE/ \
"$DESTDIR" "$RSYNCALTTARGET/" \
--variant Cloud --variant Labs \
--link-dest="$RSYNCTARGET/Everything/" --delete-after
$RSYNCPREFIX rm /pub/alt/development/$RELEASE/.composeinfo
$RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/alt/development/$RELEASE/ --name "$NEWCOMPOSE_ID"
$RSYNCPREFIX rm "$RSYNCALTTARGET/.composeinfo"
$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCALTTARGET/" --name "$NEWCOMPOSE_ID"
# Sync the content to /pub/fedora-secondary
if [ ! -d /pub/fedora-secondary/development/$RELEASE ]; then
mkdir /pub/fedora-secondary/development/$RELEASE
if [ ! -d "$RSYNCSECTARGET" ]; then
mkdir "$RSYNCSECTARGET"
fi
$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
"$DESTDIR" /pub/fedora-secondary/development/$RELEASE/ \
"$DESTDIR" "$RSYNCSECTARGET/" \
--link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
"$DESTDIR" /pub/fedora-secondary/development/$RELEASE/ \
"$DESTDIR" "$RSYNCSECTARGET/" \
--link-dest="$RSYNCTARGET/Everything/" --delete-after
$RSYNCPREFIX rm /pub/fedora-secondary/development/$RELEASE/.composeinfo
$RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/fedora-secondary/development/$RELEASE/ --name "$NEWCOMPOSE_ID"
$RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"
$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"
$RSYNCPREFIX rsync -avhH --delete-after $ATOMICHOSTREPO $ATOMICHOSTDEST