diff options
| author | Holger Levsen <holger@layer-acht.org> | 2014-10-06 16:10:05 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-10-06 16:10:05 +0200 |
| commit | 8593783258e0616dd42cb6f88a930c8589d08277 (patch) | |
| tree | 7e37d7583bccba87e32e790cb89db1da617d0ddc | |
| parent | 690803a43e87959c77ff7d97452036b3cf6bbdc6 (diff) | |
| download | jenkins.debian.net-8593783258e0616dd42cb6f88a930c8589d08277.tar.xz | |
reproducible: drop code handling .pbuilder.log files (now .rbuild.log)
| -rwxr-xr-x | bin/reproducible_build.sh | 3 | ||||
| -rwxr-xr-x | bin/reproducible_stats.sh | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 7881cc6a..0060e2bf 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -90,9 +90,8 @@ cleanup_all() { } cleanup_userContent() { - # FIXME: remove unused code once all diffp.log and pbuilder.log files are gone + # FIXME: remove unused code once all diffp.log files are gone rm -f /var/lib/jenkins/userContent/dbd/${SRCPACKAGE}_*.diffp.log > /dev/null 2>&1 - rm -f /var/lib/jenkins/userContent/pbuilder/${SRCPACKAGE}_*.pbuilder.log 2>/dev/null rm -f /var/lib/jenkins/userContent/dbd/${SRCPACKAGE}_*.debbindiff.html > /dev/null 2>&1 rm -f /var/lib/jenkins/userContent/buildinfo/${SRCPACKAGE}_*.buildinfo > /dev/null 2>&1 } diff --git a/bin/reproducible_stats.sh b/bin/reproducible_stats.sh index 6a417ba1..24cb9305 100755 --- a/bin/reproducible_stats.sh +++ b/bin/reproducible_stats.sh @@ -83,8 +83,8 @@ link_packages() { VERSION=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT version FROM source_packages WHERE name = \"$PKG\"") # remove epoch EVERSION=$(echo $VERSION | cut -d ":" -f2) - # FIXME: remove unused code once all diffp.log and pbuilder.log files are gone - if [ -f "/var/lib/jenkins/userContent/dbd/${PKG}_${EVERSION}.debbindiff.html" ] || [ -f "/var/lib/jenkins/userContent/dbd/${PKG}_${EVERSION}.diffp.log" ] || [ -f "/var/lib/jenkins/userContent/pbuilder/${PKG}_${EVERSION}.pbuilder.log" ] || [ -f "/var/lib/jenkins/userContent/buildinfo/${PKG}_${EVERSION}_amd64.buildinfo" ] || [ -f "/var/lib/jenkins/userContent/rbuild/${PKG}_${EVERSION}.rbuild.log" ]; then + # FIXME: remove unused code once all diffp.log files are gone + if [ -f "/var/lib/jenkins/userContent/dbd/${PKG}_${EVERSION}.debbindiff.html" ] || [ -f "/var/lib/jenkins/userContent/dbd/${PKG}_${EVERSION}.diffp.log" ] || [ -f "/var/lib/jenkins/userContent/buildinfo/${PKG}_${EVERSION}_amd64.buildinfo" ] || [ -f "/var/lib/jenkins/userContent/rbuild/${PKG}_${EVERSION}.rbuild.log" ]; then STAR="" MAINLINK="" init_navi_frame "$PKG" @@ -107,12 +107,6 @@ link_packages() { MAINLINK="$JENKINS_URL/userContent/rbuild/${PKG}_${EVERSION}.rbuild.log" fi fi - if [ -f "/var/lib/jenkins/userContent/pbuilder/${PKG}_${EVERSION}.pbuilder.log" ] ; then - append2navi_frame " <a href=\"$JENKINS_URL/userContent/pbuilder/${PKG}_${EVERSION}.pbuilder.log\" target=\"main\">pbuilder</a> " - if [ "$MAINLINK" = "" ] ; then - MAINLINK="$JENKINS_URL/userContent/pbuilder/${PKG}_${EVERSION}.pbuilder.log" - fi - fi append2navi_frame " <a href=\"https://packages.qa.debian.org/${PKG}\" target=\"main\">PTS</a> " append2navi_frame " <a href=\"https://bugs.debian.org/src:${PKG}\" target=\"main\">BTS</a> " append2navi_frame " <a href=\"https://sources.debian.net/src/${PKG}/\" target=\"main\">sources</a> " |