Rename Rawhide -> Bikeshed in nightly-modular.sh

Part of https://pagure.io/releng/issue/7074

Signed-off-by: Tomas Mlcoch <tmlcoch@redhat.com>
This commit is contained in:
Tomas Mlcoch 2017-10-04 18:30:45 +02:00
parent 58799ad68e
commit 5eca04913a

View File

@ -11,8 +11,8 @@ NIGHTLY="--nightly"
SKIP_PHASES="--skip-phase=productimg"
DEST=$(pwd)
DATE=$(date "+%Y%m%d")
DIST="rawhide"
BRANCHED="Modular-Rawhide"
DIST="bikeshed"
BRANCHED="Modular-Bikeshed"
BRANCH="rawhide"
GIT_BRANCH="master"
TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`
@ -22,7 +22,7 @@ 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-Modular-Rawhide/COMPOSE_ID)
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Modular-Bikeshed/COMPOSE_ID)
# assume a releng dir is a git checkout of the releng repo
# if it does not exist clone it
@ -53,7 +53,7 @@ fi
time $CMD "$@"
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Modular-Rawhide/COMPOSE_ID)
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Modular-Bikeshed/COMPOSE_ID)
SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-Modular.*-||g')
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "compose_id": "%s"}' "$BRANCHED" "$ARCH" "$NEWCOMPOSE_ID")
fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "compose_id": "%s"}' "$BRANCHED" "$ARCH" "$NEWCOMPOSE_ID")
@ -62,4 +62,4 @@ fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "compos
send_fedmsg "${fedmsg_json_done}" ${DIST} complete
# Remove old composes older than 14 days
find $TARGET_DIR/Fedora-Modular-Rawhide* -xdev -depth -maxdepth 2 -mtime +14 -exec rm -rf {} \;
find $TARGET_DIR/Fedora-Modular-Bikeshed* -xdev -depth -maxdepth 2 -mtime +14 -exec rm -rf {} \;