Revert "Disable rawhide syncing to test https://pagure.io/releng/issue/9246"

openh264 repo is enabled and is not installed in any images.

This reverts commit b18d9104bd.

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
This commit is contained in:
Mohan Boddu 2020-03-04 15:20:06 -05:00
parent b18d9104bd
commit b78189424d

View File

@ -17,7 +17,7 @@ COMPSFILE="comps-rawhide.xml"
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org" TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
FROM="Fedora Rawhide Report <rawhide@fedoraproject.org>" FROM="Fedora Rawhide Report <rawhide@fedoraproject.org>"
#RSYNCPREFIX="sudo -u ftpsync" RSYNCPREFIX="sudo -u ftpsync"
RSYNCTARGET="/pub/fedora/linux/development/$RELEASE" RSYNCTARGET="/pub/fedora/linux/development/$RELEASE"
RSYNCALTTARGET="/pub/alt/development/$RELEASE" RSYNCALTTARGET="/pub/alt/development/$RELEASE"
RSYNCSECTARGET="/pub/fedora-secondary/development/$RELEASE" RSYNCSECTARGET="/pub/fedora-secondary/development/$RELEASE"
@ -116,91 +116,91 @@ fi
# Tell interested persons that the rsync is starting (zomg!) # Tell interested persons that the rsync is starting (zomg!)
send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
#
## Sync the content to /pub/fedora # Sync the content to /pub/fedora
#if [ ! -d "$RSYNCTARGET" ]; then if [ ! -d "$RSYNCTARGET" ]; then
# mkdir "$RSYNCTARGET" mkdir "$RSYNCTARGET"
#fi fi
#$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \ $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
# "$DESTDIR" "$RSYNCTARGET/" \ "$DESTDIR" "$RSYNCTARGET/" \
# --variant Everything --variant Cloud --variant Container \ --variant Everything --variant Cloud --variant Container \
# --variant Server --variant Spins --variant Workstation --variant Silverblue --variant Modular \ --variant Server --variant Spins --variant Workstation --variant Silverblue --variant Modular \
# --link-dest="$RSYNCTARGET/Everything" --exclude=repodata --link-dest="$RSYNCTARGET/Everything" --exclude=repodata
#$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \ $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
# "$DESTDIR" "$RSYNCTARGET/" \ "$DESTDIR" "$RSYNCTARGET/" \
# --variant Everything --variant Cloud --variant Container \ --variant Everything --variant Cloud --variant Container \
# --variant Server --variant Spins --variant Workstation --variant Silverblue --variant Modular \ --variant Server --variant Spins --variant Workstation --variant Silverblue --variant Modular \
# --link-dest="$RSYNCTARGET/Everything" --delete-after --link-dest="$RSYNCTARGET/Everything" --delete-after
## aarch64 for Everything Server Cloud Container is primary # aarch64 for Everything Server Cloud Container is primary
#$RSYNCPREFIX compose-partial-copy --arch=aarch64 \ $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
# "$DESTDIR" "$RSYNCTARGET/" \ "$DESTDIR" "$RSYNCTARGET/" \
# --variant Everything --variant Server --variant Cloud --variant Container \ --variant Everything --variant Server --variant Cloud --variant Container \
# --variant Modular \ --variant Modular \
# --link-dest="$RSYNCTARGET/Everything" --exclude=repodata --link-dest="$RSYNCTARGET/Everything" --exclude=repodata
#$RSYNCPREFIX compose-partial-copy --arch=aarch64 \ $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
# "$DESTDIR" "$RSYNCTARGET/" \ "$DESTDIR" "$RSYNCTARGET/" \
# --variant Everything --variant Server --variant Cloud --variant Container \ --variant Everything --variant Server --variant Cloud --variant Container \
# --variant Modular \ --variant Modular \
# --link-dest="$RSYNCTARGET/Everything" --delete-after --link-dest="$RSYNCTARGET/Everything" --delete-after
#$RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo" $RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"
#$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID" $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID"
#
## Sync the content to /pub/alt # Sync the content to /pub/alt
#if [ ! -d "$RSYNCALTTARGET" ]; then if [ ! -d "$RSYNCALTTARGET" ]; then
# mkdir "$RSYNCALTTARGET" mkdir "$RSYNCALTTARGET"
#fi fi
#$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \ $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
# "$DESTDIR" "$RSYNCALTTARGET/" \ "$DESTDIR" "$RSYNCALTTARGET/" \
# --variant Labs \ --variant Labs \
# --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
#$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \ $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
# "$DESTDIR" "$RSYNCALTTARGET/" \ "$DESTDIR" "$RSYNCALTTARGET/" \
# --variant Labs \ --variant Labs \
# --link-dest="$RSYNCTARGET/Everything/" --delete-after --link-dest="$RSYNCTARGET/Everything/" --delete-after
#$RSYNCPREFIX rm "$RSYNCALTTARGET/.composeinfo" $RSYNCPREFIX rm "$RSYNCALTTARGET/.composeinfo"
#$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCALTTARGET/" --name "$NEWCOMPOSE_ID" $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCALTTARGET/" --name "$NEWCOMPOSE_ID"
#
## Sync the content to /pub/fedora-secondary # Sync the content to /pub/fedora-secondary
#if [ ! -d "$RSYNCSECTARGET" ]; then if [ ! -d "$RSYNCSECTARGET" ]; then
# mkdir "$RSYNCSECTARGET" mkdir "$RSYNCSECTARGET"
#fi fi
#$RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \ $RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \
# "$DESTDIR" "$RSYNCSECTARGET/" \ "$DESTDIR" "$RSYNCSECTARGET/" \
# --variant Everything --variant Cloud --variant Container \ --variant Everything --variant Cloud --variant Container \
# --variant Labs --variant Server --variant Spins --variant Workstation --variant Modular \ --variant Labs --variant Server --variant Spins --variant Workstation --variant Modular \
# --link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --exclude=repodata --link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --exclude=repodata
#$RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \ $RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \
# "$DESTDIR" "$RSYNCSECTARGET/" \ "$DESTDIR" "$RSYNCSECTARGET/" \
# --variant Everything --variant Cloud --variant Container \ --variant Everything --variant Cloud --variant Container \
# --variant Labs --variant Server --variant Spins --variant Workstation --variant Modular \ --variant Labs --variant Server --variant Spins --variant Workstation --variant Modular \
# --link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --delete-after --link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --delete-after
## aarch64 is alternative for Labs Spins Workstation # aarch64 is alternative for Labs Spins Workstation
#$RSYNCPREFIX compose-partial-copy --arch=aarch64 \ $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
# "$DESTDIR" "$RSYNCSECTARGET/" \ "$DESTDIR" "$RSYNCSECTARGET/" \
# --variant Labs --variant Spins --variant Workstation \ --variant Labs --variant Spins --variant Workstation \
# --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata --link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
#$RSYNCPREFIX compose-partial-copy --arch=aarch64 \ $RSYNCPREFIX compose-partial-copy --arch=aarch64 \
# "$DESTDIR" "$RSYNCSECTARGET/" \ "$DESTDIR" "$RSYNCSECTARGET/" \
# --variant Labs --variant Spins --variant Workstation \ --variant Labs --variant Spins --variant Workstation \
# --link-dest="$RSYNCTARGET/Everything/" --delete-after --link-dest="$RSYNCTARGET/Everything/" --delete-after
#$RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo" $RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"
#$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID" $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"
#
## sync Silverblue to the unified ostree repo # sync Silverblue to the unified ostree repo
#for arch in x86_64 ppc64le aarch64; do for arch in x86_64 ppc64le aarch64; do
# ref="fedora/rawhide/${arch}/silverblue" ref="fedora/rawhide/${arch}/silverblue"
# if ! ostree --repo=$OSTREESRCREPO rev-parse "${ref}"; then continue; fi if ! ostree --repo=$OSTREESRCREPO rev-parse "${ref}"; then continue; fi
#
# ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "${ref}" ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "${ref}"
# ostree summary -u --repo=$OSTREEDESTREPO # update summary file ostree summary -u --repo=$OSTREEDESTREPO # update summary file
#done done
#
## Push rawhide base container image to fedora registry # Push rawhide base container image to fedora registry
#pushd ./releng pushd ./releng
#pushd ./scripts pushd ./scripts
#./sync-latest-container-base-image.sh 33 ./sync-latest-container-base-image.sh 33
#popd popd
#popd popd
# Tell interested persons that the rsync is done. # Tell interested persons that the rsync is done.
send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete