Apply cloud, docker and twoweek changes from 27 branch to master
These aren't really used on the master branch, but we may as well make sure they're up to date, if only so *next* time we branch we don't regress. These are the changes I made to add the shortname to fedmsgs, fix exit on failed compose, and clean up a few other things. Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson
parent
4347965ab4
commit
bdf439a42a
@ -12,19 +12,16 @@ 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")
|
||||
DIST="26"
|
||||
BRANCHED="26"
|
||||
BRANCH="branched"
|
||||
COMPSFILE="comps-f26.xml"
|
||||
GIT_BRANCH="f26"
|
||||
TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`
|
||||
# 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"
|
||||
ATOMIC=$(mktemp -d /tmp/atomic.${DIST}.$DATE.XXXX)
|
||||
ATOMICREPO="/mnt/koji/compose/atomic/$BRANCHED/"
|
||||
ATOMICDEST="/mnt/koji/atomic/$BRANCHED/"
|
||||
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-26/COMPOSE_ID)
|
||||
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
|
||||
@ -37,13 +34,12 @@ 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"}' "$BRANCHED" "$ARCH")
|
||||
fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s"}' "$BRANCHED" "$ARCH")
|
||||
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}" ${DIST} start
|
||||
send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
|
||||
pushd $TMPDIR
|
||||
git clone https://pagure.io/fedora-comps.git && {
|
||||
pushd fedora-comps
|
||||
@ -59,29 +55,31 @@ else
|
||||
CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
|
||||
fi
|
||||
time $CMD "$@"
|
||||
if [ "$?" = "0" ]; then
|
||||
export mail=0
|
||||
if [ "$?" != "0" ]; then
|
||||
exit 1
|
||||
fi
|
||||
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-26/COMPOSE_ID)
|
||||
|
||||
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}" ${DIST} rsync.start
|
||||
#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}" ${DIST} rsync.complete
|
||||
#send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
|
||||
# Tell everyone by fedmsg about the compose
|
||||
send_fedmsg "${fedmsg_json_done}" ${DIST} complete
|
||||
send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
|
||||
# Tell everyone by email about the compose
|
||||
SUBJECT='Fedora '$DIST' compose report: '$SHORTCOMPOSE_ID' changes'
|
||||
#if [ "$mail" = "0" ]; then
|
||||
# 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
|
||||
#fi
|
||||
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
|
||||
|
||||
@ -11,19 +11,16 @@ 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")
|
||||
DIST="26"
|
||||
BRANCHED="26"
|
||||
BRANCH="branched"
|
||||
COMPSFILE="comps-f26.xml"
|
||||
GIT_BRANCH="f26"
|
||||
TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`
|
||||
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
|
||||
SHORT="Fedora-Docker"
|
||||
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"
|
||||
ATOMIC=$(mktemp -d /tmp/atomic.${DIST}.$DATE.XXXX)
|
||||
ATOMICREPO="/mnt/koji/compose/atomic/$BRANCHED/"
|
||||
ATOMICDEST="/pub/fedora/linux/atomic/$BRANCHED/"
|
||||
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora_Docker-26/COMPOSE_ID)
|
||||
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 teh releng repo
|
||||
@ -36,13 +33,12 @@ 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"}' "$BRANCHED" "$ARCH")
|
||||
fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s"}' "$BRANCHED" "$ARCH")
|
||||
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...
|
||||
send_fedmsg "${fedmsg_json_start}" ${DIST} start
|
||||
send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
|
||||
pushd $TMPDIR
|
||||
git clone https://pagure.io/fedora-comps.git && {
|
||||
pushd fedora-comps
|
||||
@ -58,27 +54,29 @@ else
|
||||
CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
|
||||
fi
|
||||
time $CMD "$@"
|
||||
if [ "$?" = "0" ]; then
|
||||
export mail=0
|
||||
if [ "$?" != "0" ]; then
|
||||
exit 1
|
||||
fi
|
||||
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora_Docker-26/COMPOSE_ID)
|
||||
|
||||
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")
|
||||
|
||||
DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
|
||||
$RSYNCPREFIX mkdir -p $DESTDIR
|
||||
# Tell interested persons that the rsync is starting (zomg!)
|
||||
send_fedmsg "${fedmsg_json_start}" ${DIST} rsync.start
|
||||
#send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
|
||||
#for dir in Docker 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}" ${DIST} rsync.complete
|
||||
#send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
|
||||
# Tell everyone by fedmsg about the compose
|
||||
send_fedmsg "${fedmsg_json_done}" ${DIST} complete
|
||||
SUBJECT='Fedora '$DIST' compose report: '$SHORTCOMPOSE_ID' changes'
|
||||
#if [ "$mail" = "0" ]; then
|
||||
# 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
|
||||
#fi
|
||||
send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
|
||||
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
|
||||
|
||||
@ -11,19 +11,16 @@ NIGHTLY=""
|
||||
SKIP_PHASES="--skip-phase=productimg --skip-phase=extra_files"
|
||||
DEST=$(pwd)
|
||||
DATE=$(date "+%Y%m%d")
|
||||
DIST="26"
|
||||
BRANCHED="26"
|
||||
BRANCH="branched"
|
||||
COMPSFILE="comps-f26.xml"
|
||||
GIT_BRANCH="f26"
|
||||
TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`
|
||||
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
|
||||
SHORT="Fedora-Atomic"
|
||||
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"
|
||||
ATOMIC=$(mktemp -d /tmp/atomic.${DIST}.$DATE.XXXX)
|
||||
ATOMICREPO="/mnt/koji/compose/atomic/$BRANCHED/"
|
||||
ATOMICDEST="/pub/fedora/linux/atomic/$BRANCHED/"
|
||||
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Atomic-26/COMPOSE_ID)
|
||||
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 teh releng repo
|
||||
@ -36,13 +33,12 @@ 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"}' "$BRANCHED" "$ARCH")
|
||||
fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s"}' "$BRANCHED" "$ARCH")
|
||||
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...
|
||||
send_fedmsg "${fedmsg_json_start}" ${DIST} start
|
||||
send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
|
||||
pushd $TMPDIR
|
||||
git clone https://pagure.io/fedora-comps.git && {
|
||||
pushd fedora-comps
|
||||
@ -58,28 +54,30 @@ else
|
||||
CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
|
||||
fi
|
||||
time $CMD "$@"
|
||||
if [ "$?" = "0" ]; then
|
||||
export mail=0
|
||||
if [ "$?" != "0" ]; then
|
||||
exit 1
|
||||
fi
|
||||
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Atomic-26/COMPOSE_ID)
|
||||
|
||||
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")
|
||||
|
||||
DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
|
||||
$RSYNCPREFIX mkdir -p $DESTDIR
|
||||
# Tell interested persons that the rsync is starting (zomg!)
|
||||
send_fedmsg "${fedmsg_json_start}" ${DIST} rsync.start
|
||||
send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
|
||||
for dir in Atomic CloudImages Docker metadata ;
|
||||
do
|
||||
$RSYNCPREFIX rsync -avhH $TARGET_DIR/$NEWCOMPOSE_ID/compose/$dir/ /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/$dir/ ;
|
||||
$RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/alt/atomic/testing/$SHORTCOMPOSE_ID/ --name $NEWCOMPOSE_ID
|
||||
done
|
||||
# Tell interested persons that the rsync is done.
|
||||
send_fedmsg "${fedmsg_json_done}" ${DIST} rsync.complete
|
||||
send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
|
||||
# Tell everyone by fedmsg about the compose
|
||||
send_fedmsg "${fedmsg_json_done}" ${DIST} complete
|
||||
SUBJECT='Fedora '$DIST' compose report: '$SHORTCOMPOSE_ID' changes'
|
||||
#if [ "$mail" = "0" ]; then
|
||||
# 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
|
||||
#fi
|
||||
send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user