585deac61c
The various post-release composes - two-week Atomic, Cloud, and Docker - all send out identical fedmsgs. The other commits in this PR at least ensure the fedmsgs sent after the compose is done will have a `compose_id` key, allowing disambiguation that way, but fedmsgs sent *before* the compose is done cannot be told apart. This should solve that, without inventing new message topics: we add a `short` key to the message content which specifies the 'shortname' of the compose (e.g. Fedora-Atomic), which is how we distinguish these composes from each other. We also remove a bunch of unused variables from these files, and revise the release-related variables as explained for the master branch in #485: `$DIST`, `$BRANCH` and `$BRANCHED` are all replaced by `$RELEASE` and `$RELEASE_TITLE`. This does duplicate the value from the pungi config file, but I'm not sure it's worth figuring out a bash-y way to parse the value out of the config file just to remove this duplication. And we already effectively did this when discovering `OLDCOMPOSE_ID` and `NEWCOMPOSE_ID`, as the path used there is dependent upon the shortname; to avoid extra duplication, I've changed those to use `$SHORT-$RELEASE_TITLE`. Signed-off-by: Adam Williamson <awilliam@redhat.com>
86 lines
3.5 KiB
Bash
Executable File
86 lines
3.5 KiB
Bash
Executable File
#!/bin/sh
|
|
#set -x
|
|
export LC_ALL=C
|
|
LABEL=$1
|
|
# Remove the label from arguments. It gets special treatment. Other arguments
|
|
# to the script are passed to pungi-koji directly.
|
|
shift
|
|
CONFIG="fedora-cloud.conf"
|
|
TARGET_DIR="/mnt/koji/compose/"
|
|
#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
|
|
NIGHTLY=""
|
|
SKIP_PHASES="--skip-phase=productimg --skip-phase=pkgset --skip-phase=gather --skip-phase=extra_files --skip-phase=creatrepo"
|
|
DEST=$(pwd)
|
|
DATE=$(date "+%Y%m%d")
|
|
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
|
|
SHORT="Fedora-Cloud"
|
|
RELEASE="27"
|
|
RELEASE_TITLE="27"
|
|
COMPSFILE="comps-f27.xml"
|
|
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
|
TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
|
|
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
|
|
RSYNCPREFIX="sudo -u ftpsync"
|
|
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
|
|
# uncomment and edit for resuming a failed compose
|
|
#COMPOSE_ID="Fedora-23-20150530.n.0"
|
|
# assume a releng dir is a git checkout of the releng repo
|
|
# if it does not exist clone it
|
|
if [ -d releng ]; then
|
|
pushd releng
|
|
git pull --rebase
|
|
popd
|
|
else
|
|
git clone https://pagure.io/releng.git
|
|
fi
|
|
# Set up our fedmsg function, using the releng repo definition
|
|
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
|
|
FEDMSG_MODNAME="compose"
|
|
FEDMSG_CERTPREFIX="releng"
|
|
. ./releng/scripts/fedmsg-functions.sh
|
|
# Announce that we are starting, even though we don't know the compose_id yet..
|
|
send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
|
|
pushd $TMPDIR
|
|
git clone https://pagure.io/fedora-comps.git && {
|
|
pushd fedora-comps
|
|
make "${COMPSFILE}"
|
|
cp "${COMPSFILE}" $DEST/
|
|
popd
|
|
}
|
|
popd
|
|
CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES --label=$LABEL"
|
|
if [ -z "$COMPOSE_ID" ]; then
|
|
CMD="$CMD --target-dir=$TARGET_DIR"
|
|
else
|
|
CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
|
|
fi
|
|
time $CMD "$@"
|
|
if [ "$?" != "0" ]; then
|
|
exit 1
|
|
fi
|
|
|
|
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
|
|
SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
|
|
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID")
|
|
fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID")
|
|
|
|
# Set this to use later for a few items include depcheck
|
|
DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
|
|
$RSYNCPREFIX mkdir -p $DESTDIR
|
|
# Tell interested persons that the rsync is starting (zomg!)
|
|
#send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
|
|
#for dir in CloudImage metadata ;
|
|
# do
|
|
# $RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;
|
|
# done
|
|
# Tell interested persons that the rsync is done.
|
|
#send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
|
|
# Tell everyone by fedmsg about the compose
|
|
send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
|
|
# Tell everyone by email about the compose
|
|
SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
|
|
#for tomail in $TOMAIL ; do
|
|
# cat $TARGET_DIR/$NEWCOMPOSE_ID/logs/*verbose $DESTDIR/logs/depcheck | \
|
|
# mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
|
|
#done
|