[Qa-jenkins-scm] [jenkins.debian.net] 02/03: reproducible Debian / Arch Linux: refactoring

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 9449e70ad3f1b6bd427181cac3a5f17419ba5426
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Dec 10 19:32:31 2017 +0000

    reproducible Debian / Arch Linux: refactoring
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_common.sh         | 14 ++++++++------
 bin/reproducible_html_archlinux.sh |  1 -
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 6c24653..d5776f2 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -21,9 +21,8 @@ query_to_csv() {
 }
 
 # common variables
+BASE="/var/lib/jenkins/userContent/reproducible"
 REPRODUCIBLE_URL=https://tests.reproducible-builds.org
-DEBIAN_URL=https://tests.reproducible-builds.org/debian
-DEBIAN_DASHBOARD_URI=/debian/reproducible.html
 REPRODUCIBLE_DOT_ORG_URL=https://reproducible-builds.org
 # shop trailing slash
 JENKINS_URL=${JENKINS_URL:0:-1}
@@ -43,6 +42,12 @@ MAINNODE="jenkins" # used by reproducible_maintenance.sh only
 # variables on the nodes we are interested in
 BUILD_ENV_VARS="ARCH NUM_CPU CPU_MODEL DATETIME KERNEL" # these also needs to be defined in bin/reproducible_info.sh
 
+# common settings for Debian
+DEBIAN_URL=https://tests.reproducible-builds.org/debian
+DEBIAN_DASHBOARD_URI=/debian/reproducible.html
+DEBIAN_BASE="/var/lib/jenkins/userContent/reproducible/debian"
+mkdir -p "$DEBIAN_BASE"
+
 # existing usertags in the Debian BTS
 USERTAGS="toolchain infrastructure timestamps fileordering buildpath username hostname uname randomness buildinfo cpu signatures environment umask ftbfs locale"
 
@@ -50,6 +55,7 @@ USERTAGS="toolchain infrastructure timestamps fileordering buildpath username ho
 ARCHLINUX_REPOS="core extra multilib community"
 ARCHLINUX_PKGS=/srv/reproducible-results/archlinux_pkgs
 ARCHLINUX_BLACKLISTED="syslinux ltrace gnutls zathura"
+ARCHBASE=$BASE/archlinux
 
 # common settings for testing rpm based distros
 RPM_BUILD_NODE=profitbricks-build3-amd64
@@ -64,10 +70,6 @@ DIFFOSCOPE_VIRT_LIMIT=$((10*1024*1024))
 # we only this array for html creation but we cannot declare them in a function
 declare -A SPOKENTARGET
 
-BASE="/var/lib/jenkins/userContent/reproducible"
-DEBIAN_BASE="/var/lib/jenkins/userContent/reproducible/debian"
-mkdir -p "$DEBIAN_BASE"
-
 # to hold reproducible temporary files/directories without polluting /tmp
 TEMPDIR="/tmp/reproducible"
 mkdir -p "$TEMPDIR"
diff --git a/bin/reproducible_html_archlinux.sh b/bin/reproducible_html_archlinux.sh
index 6891a4e..f0f2daf 100755
--- a/bin/reproducible_html_archlinux.sh
+++ b/bin/reproducible_html_archlinux.sh
@@ -11,7 +11,6 @@ common_init "$@"
 # common code
 . /srv/jenkins/bin/reproducible_common.sh
 
-ARCHBASE=$BASE/archlinux
 #
 # analyse results to create the webpage
 #

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git