summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lamb <lamby@debian.org>2015-02-19 02:29:24 +0000
committerChris Lamb <lamby@debian.org>2015-02-19 02:29:24 +0000
commit89a95aa07ad805f3cdc2bb047089b2c612a5b754 (patch)
treebda602728ab83fb0843637cdcee8c65a4357d075
parentb7c7ff5aced09d3abeec5fa41494e14ac198d448 (diff)
downloadjenkins.debian.net-89a95aa07ad805f3cdc2bb047089b2c612a5b754.tar.xz
Condense rescheduling onto a single line
-rwxr-xr-xbin/reproducible_maintainance.sh1
-rwxr-xr-xbin/reproducible_schedule_on_demand.sh6
2 files changed, 5 insertions, 2 deletions
diff --git a/bin/reproducible_maintainance.sh b/bin/reproducible_maintainance.sh
index 98187496..cbe99ef2 100755
--- a/bin/reproducible_maintainance.sh
+++ b/bin/reproducible_maintainance.sh
@@ -90,7 +90,6 @@ if [ ! -z "$FAILED_BUILDS" ] ; then
echo
echo "Rescheduling packages: "
( for PKG in $(echo $FAILED_BUILDS | sed "s# #\n#g" | cut -d "/" -f7 | cut -d "_" -f1) ; do echo $PKG ; done ) | xargs /srv/jenkins/bin/reproducible_schedule_on_demand.sh
- kgb-client --conf /srv/jenkins/kgb/debian-reproducible.conf --relay-msg "This manual rescheduling was automatically done for you by $BUILD_URL"
echo
DIRTY=true
fi
diff --git a/bin/reproducible_schedule_on_demand.sh b/bin/reproducible_schedule_on_demand.sh
index 781db0bb..5b4f3ea0 100755
--- a/bin/reproducible_schedule_on_demand.sh
+++ b/bin/reproducible_schedule_on_demand.sh
@@ -60,7 +60,11 @@ if [ ${#PACKAGES} -gt 256 ] ; then
BLABLABLA="..."
fi
PACKAGES=$(echo $PACKAGES)
-MESSAGE="$TOTAL $PACKAGES_TXT manually scheduled: ${PACKAGES:0:256}$BLABLABLA"
+ACTION="manually rescheduled"
+if [ -n "${BUILD_URL:-}" ] ; then
+ ACTION="rescheduled by $BUILD_URL"
+fi
+MESSAGE="$TOTAL $PACKAGES_TXT $ACTION: ${PACKAGES:0:256}$BLABLABLA"
# finally
schedule_packages