summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-10-17 23:32:16 +0200
committerHolger Levsen <holger@layer-acht.org>2014-10-18 01:32:19 +0200
commita0b4a3c0659e56937ac4ba5ded3aa017a0da9b27 (patch)
treec7e60b0d0790dd468cfbd016c3558858cf8fdced
parent4c048fd44ef1b7d46af3854b0c44a71ff6cbb11d (diff)
downloadjenkins.debian.net-a0b4a3c0659e56937ac4ba5ded3aa017a0da9b27.tar.xz
reproducible: only link existing packages and count and thus schedule correctly
-rwxr-xr-xbin/reproducible_common.sh8
-rwxr-xr-xbin/reproducible_scheduler.sh2
2 files changed, 7 insertions, 3 deletions
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 1a30bbaa..38c1333f 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -258,8 +258,12 @@ set_package_class() {
force_package_targets() {
for PKG in $@ ; do
- set_package_class
- LINKTARGET[$PKG]="<a href=\"$JENKINS_URL/userContent/rb-pkg/$PKG.html\" $CLASS>$PKG</a>"
+ if [ -f /var/lib/jenkins/userContent/rb-pkg/$PKG.html ] ; then
+ set_package_class
+ LINKTARGET[$PKG]="<a href=\"$JENKINS_URL/userContent/rb-pkg/$PKG.html\" $CLASS>$PKG</a>"
+ else
+ LINKTARGET[$PKG]="$PKG"
+ fi
done
}
diff --git a/bin/reproducible_scheduler.sh b/bin/reproducible_scheduler.sh
index c0ee4d39..67d21745 100755
--- a/bin/reproducible_scheduler.sh
+++ b/bin/reproducible_scheduler.sh
@@ -162,7 +162,7 @@ update_sources_table
echo "Requesting 200 unknown packages..."
select_unknown_packages 200
-let "TOTAL=$SCHEDULED+$AMOUNT"
+let "TOTAL=$COUNT_SCHEDULED+$AMOUNT"
echo "So in total now $TOTAL packages about to be scheduled."
ALL_PACKAGES="$PACKAGES"
MESSAGE="Scheduled $AMOUNT unknown packages"