From 69508d8bc4a61c31521ce6b2ca3564b5acd005f3 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Sep 06 2024 16:51:21 +0000 Subject: Enable rsync to /pub/eln Signed-off-by: Stephen Gallagher --- diff --git a/eln-nightly.sh b/eln-nightly.sh index 0092c63..4f2761a 100755 --- a/eln-nightly.sh +++ b/eln-nightly.sh @@ -19,9 +19,7 @@ TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="devel@lists.fedoraproject.org test-reports@lists.fedoraproject.org" FROM="Fedora ELN Report " RSYNCPREFIX="sudo -u ftpsync" -RSYNCTARGET="/pub/fedora/linux/development/$RELEASE" -RSYNCALTTARGET="/pub/alt/development/$RELEASE" -RSYNCSECTARGET="/pub/fedora-secondary/development/$RELEASE" +RSYNCTARGET="/pub/eln/" OSTREESRCREPO="/mnt/koji/compose/ostree/repo/" OSTREEDESTREPO="/mnt/koji/ostree/repo/" OLDCOMPOSE_ID=$(cat $TARGET_DIR/LAST_COMPOSE_ID) @@ -95,7 +93,45 @@ fi ./releng/scripts/critpath.py --composeurl file://$DESTDIR/compose -o $DESTDIR/logs/critpath.txt rawhide &> $DESTDIR/logs/critpath.log } -# TODO: sync to properl location +# Tell interested persons that the rsync is starting (zomg!) +send_fedora_message "${fedora_message_json_start}" ${RELEASE} rsync.start + +# Sync the content to /pub/fedora-eln +if [ ! -d "$RSYNCTARGET" ]; then + $RSYNCPREFIX mkdir -p "$RSYNCTARGET" +fi + +included_variants=( + AppStream + BaseOS + CRB + Extras + HighAvailability + NFV + ResilientStorage + RT + SAP + SAPHANA +) +$RSYNCPREFIX compose-partial-copy \ + --arch=aarch64 --arch=x86_64 --arch=ppc64le --arch=s390x --arch=src \ + "$DESTDIR" "$RSYNCTARGET/" \ + ${variants[@]/#/--variant } \ + --exclude=repodata +$RSYNCPREFIX compose-partial-copy \ + --arch=aarch64 --arch=x86_64 --arch=ppc64le --arch=s390x --arch=src \ + "$DESTDIR" "$RSYNCTARGET/" \ + ${variants[@]/#/--variant } \ + --delete-after +$RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo" +$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID" + +# hardlink content +time hardlink -v "$RSYNCTARGET" + +# Tell interested persons that the rsync is done. +send_fedora_message "${fedora_message_json_done}" ${RELEASE} rsync.complete + # Tell everyone by fedora_message about the compose send_fedora_message "${fedora_message_json_done}" ${RELEASE} complete