summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-06-14 17:10:57 +0200
committerHolger Levsen <holger@layer-acht.org>2016-06-14 17:10:57 +0200
commitb9d6c50b134d85fed96cd5a5c087253b01e7541d (patch)
tree608b186b7e67248fcc8f6af5d3c1bc551c697182
parentfbb9fc3ce85c28aa586814ff1a6c64576ee328ea (diff)
downloadjenkins.debian.net-b9d6c50b134d85fed96cd5a5c087253b01e7541d.tar.xz
reproducible debian: more changes for the /debian/ move to not break other projects
-rwxr-xr-xbin/reproducible_common.sh4
-rwxr-xr-xbin/reproducible_html_dashboard.sh8
-rwxr-xr-xbin/reproducible_html_pkg_sets.sh4
-rwxr-xr-xbin/reproducible_html_repository_comparison.sh2
4 files changed, 9 insertions, 9 deletions
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 495682c4..9a5f76df 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -565,9 +565,9 @@ publish_page() {
else
TARGET=$1/$PAGE
fi
- cp $PAGE $DEBIAN_BASE/$TARGET
+ cp -v $PAGE $BASE/$TARGET
rm $PAGE
- echo "Enjoy $DEBIAN_URL/$TARGET"
+ echo "Enjoy $REPRODUCIBLE_URL/$TARGET"
}
link_packages() {
diff --git a/bin/reproducible_html_dashboard.sh b/bin/reproducible_html_dashboard.sh
index fb1d5654..15e6cbde 100755
--- a/bin/reproducible_html_dashboard.sh
+++ b/bin/reproducible_html_dashboard.sh
@@ -445,7 +445,7 @@ create_suite_arch_stats_page() {
write_meta_pkg_graphs_links
fi
write_page_footer
- publish_page $SUITE
+ publish_page debian/$SUITE
}
write_meta_pkg_graphs_links () {
@@ -558,7 +558,7 @@ create_dashboard_page() {
# the end
write_page_footer
cp $PAGE $DEBIAN_BASE/reproducible.html
- publish_page
+ publish_page debian
}
#
@@ -596,7 +596,7 @@ create_performance_page() {
done
write_page ".</p>"
write_page_footer
- publish_page
+ publish_page debian
}
#
@@ -614,7 +614,7 @@ create_variations_page() {
write_page "<p style=\"clear:both;\">"
write_page "</p>"
write_page_footer
- publish_page
+ publish_page debian
}
#
diff --git a/bin/reproducible_html_pkg_sets.sh b/bin/reproducible_html_pkg_sets.sh
index dd161f4b..bc875fa6 100755
--- a/bin/reproducible_html_pkg_sets.sh
+++ b/bin/reproducible_html_pkg_sets.sh
@@ -131,7 +131,7 @@ create_pkg_sets_pages() {
write_page_header $VIEW "Package sets in $SUITE/$ARCH for Reproducible builds"
create_pkg_sets_navigation index
write_page_footer
- publish_page $SUITE/$ARCH
+ publish_page debian/$SUITE/$ARCH
#
# create individual pages for all the sets
#
@@ -199,7 +199,7 @@ create_pkg_sets_pages() {
write_page_meta_sign
fi
write_page_footer
- publish_page $SUITE/$ARCH
+ publish_page debian/$SUITE/$ARCH
done
}
diff --git a/bin/reproducible_html_repository_comparison.sh b/bin/reproducible_html_repository_comparison.sh
index c3ee6742..34441ab3 100755
--- a/bin/reproducible_html_repository_comparison.sh
+++ b/bin/reproducible_html_repository_comparison.sh
@@ -238,7 +238,7 @@ write_page "<p><table><tr><th class=\"center\">obsoleted package,<br />version i
cat $TABLE_DONE >> $PAGE
write_page "</table></p>"
write_page_footer
-publish_page
+publish_page debian
echo "$MODIFIED_IN_SID" > /srv/reproducible-results/modified_in_sid.txt
echo "$MODIFIED_IN_EXP" > /srv/reproducible-results/modified_in_exp.txt
echo "$BINNMUS_NEEDED" > /srv/reproducible-results/binnmus_needed.txt