summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2015-03-02 01:44:54 +0100
committerHolger Levsen <holger@layer-acht.org>2015-03-02 01:46:18 +0100
commitd45c9b4d45f294e2f6135abf89153c7904c52aea (patch)
treee7ce069e2e82e691b1a2aa6bde2f357f14b2c7ce
parenta27bad611bfd95ef3e79e0a71289bac32cab6dda (diff)
downloadjenkins.debian.net-d45c9b4d45f294e2f6135abf89153c7904c52aea.tar.xz
reproducible: add the suite to the gen_packages_html() call
-rwxr-xr-xbin/reproducible_blacklist.sh2
-rwxr-xr-xbin/reproducible_build.sh2
-rwxr-xr-xbin/reproducible_common.sh4
3 files changed, 5 insertions, 3 deletions
diff --git a/bin/reproducible_blacklist.sh b/bin/reproducible_blacklist.sh
index 779e886e..4eb93e62 100755
--- a/bin/reproducible_blacklist.sh
+++ b/bin/reproducible_blacklist.sh
@@ -51,7 +51,7 @@ fi
# finally
blacklist_packages
-gen_packages_html $PACKAGES
+gen_packages_html $SUITE $PACKAGES
echo
echo "$MESSAGE"
kgb-client --conf /srv/jenkins/kgb/debian-reproducible.conf --relay-msg "$MESSAGE"
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index e88e5899..7dfe1258 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -39,7 +39,7 @@ update_db_and_html() {
# unmark build as properly finished
sqlite3 -init $INIT ${PACKAGES_DB} "DELETE FROM schedule WHERE package_id='$SRCPKGID';"
set +x
- gen_packages_html $SRCPACKAGE
+ gen_packages_html $SUITE $SRCPACKAGE
echo
echo "Successfully updated the database and updated $REPRODUCIBLE_URL/rb-pkg/${SUITE}/$SRCPACKAGE.html"
echo
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 8e6d30bb..d34f1d42 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -219,6 +219,8 @@ link_packages() {
}
gen_packages_html() {
+ local suite="$1"
+ shift
CWD=$(pwd)
cd /srv/jenkins/bin
for (( i=1; i<$#+1; i=i+100 )) ; do
@@ -232,7 +234,7 @@ gen_packages_html() {
fi
done
string+=']'
- python3 -c "from reproducible_html_packages import gen_packages_html; gen_packages_html(${string}, no_clean=True)"
+ python3 -c "from reproducible_html_packages import gen_packages_html; gen_packages_html(${string}, suite=\"${suite}\" no_clean=True)"
done
python3 -c "from reproducible_html_packages import purge_old_pages; purge_old_pages()"
cd "$CWD"