From 4e350e68f2f96f26e0c4f19cda4547446288a67f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Feb 29 2016 22:24:02 +0000 Subject: tie in missing functionality tie in some scripts for the releng repo and mash to get thinsg more complete Signed-off-by: Dennis Gilmore --- diff --git a/nightly.sh b/nightly.sh index 633463e..7375a6c 100755 --- a/nightly.sh +++ b/nightly.sh @@ -27,6 +27,16 @@ OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-/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 +# 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 + pushd $TMPDIR git clone https://git.fedorahosted.org/git/comps.git && { pushd comps @@ -36,7 +46,7 @@ git clone https://git.fedorahosted.org/git/comps.git && { } popd - +./releng/scripts/block_retired.py CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES" @@ -85,6 +95,11 @@ $MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "pushd ${DESTDIR}/compose/Atomic/ $MOCK -r $MOCKCONFIG --uniqueext=$DATE --clean compose-changelog -p $TARGET_DIR/$NEWCOMPOSE_ID/logs/ $TARGET_DIR/$OLDCOMPOSE_ID/ $TARGET_DIR/$NEWCOMPOSE_ID/ +/usr/share/mash/spam-o-matic $DESTDIR/compose/Everything/ >$DESTDIR/logs/depcheck + +[ -z "$ARCH" ] && { +./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything -o $DESTDIR/logs/critpath.txt branched &> $DESTDIR/logs/critpath.log +} for dir in Everything Atomic CloudImages Docker Server Spins Workstation ; @@ -102,8 +117,20 @@ for dir in Cloud Labs ; SUBJECT='Fedora '$DIST' compose report: '$SHORTCOMPOSE_ID' changes' if [ "$mail" = "0" ]; then for tomail in "$(echo $TOMAIL)" ; do - cat $TARGET_DIR/$NEWCOMPOSE_ID/logs/*verbose | \ + 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 +for koji in arm ppc s390 +do + if [ "$koji" = "arm" ]; then + arches=aarch64 + elif [ "$koji" = "ppc" ]; then + arches=ppc64,ppc64le + elif [ "$koji" = "s390" ]; then + arches=s390,s390x + fi + ./releng/scripts/srpm-excluded-arch.py -a $arches --path $DESTDIR/compose/Everything/source/tree/SRPMS/\*/ >$DESTDIR/logs/excludearch-$koji.log +done +