From 1f7752e499b069c397ff2d0e5ab685a638d60a7a Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Fri, 17 Feb 2017 18:51:47 -0500 Subject: [PATCH] Additing execute permission to cloud-nightly.sh Signed-off-by: Mohan Boddu --- cloud-nightly.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) mode change 100644 => 100755 cloud-nightly.sh diff --git a/cloud-nightly.sh b/cloud-nightly.sh old mode 100644 new mode 100755 index 6f1aca8..4cee9a1 --- a/cloud-nightly.sh +++ b/cloud-nightly.sh @@ -1,7 +1,11 @@ #!/bin/sh + #set -x + export LC_ALL=C + LABEL=$1 + CONFIG="fedora-cloud.conf" TARGET_DIR="/mnt/koji/compose/" #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR" @@ -24,6 +28,7 @@ ATOMICDEST="/mnt/koji/atomic/$BRANCHED/" OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-24/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 @@ -33,14 +38,17 @@ if [ -d releng ]; then 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_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 + pushd $TMPDIR git clone https://pagure.io/fedora-comps.git && { pushd fedora-comps @@ -49,31 +57,41 @@ git clone https://pagure.io/fedora-comps.git && { 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 export mail=0 fi + NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-24/COMPOSE_ID) SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g') + # 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 + #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 + # Tell everyone by fedmsg about the compose send_fedmsg "${fedmsg_json_done}" ${DIST} complete + # Tell everyone by email about the compose SUBJECT='Fedora '$DIST' compose report: '$SHORTCOMPOSE_ID' changes' #if [ "$mail" = "0" ]; then