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