reproducible archlinux: refactor, define repositories once

3 files changed, 8 insertions, 3 deletions

diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh
index 38f51a2b..a15f7bf6 100755
--- a/bin/reproducible_build_archlinux_pkg.sh
+++ b/bin/reproducible_build_archlinux_pkg.sh
@@ -46,7 +46,7 @@ choose_package() {
 	local SESSION="archlinux-scheduler-$RANDOM"
 	schroot --begin-session --session-name=$SESSION -c jenkins-reproducible-archlinux
 	local REPO
-	for REPO in core extra ; do
+	for REPO in $ARCHLINUX_REPOS ; do
 		if [ ! -f ${ARCHLINUX_PKGS}_$REPO ] || [ $DUMMY -nt ${ARCHLINUX_PKGS}_$REPO ] ; then
 			echo "$(date -u ) - updating list of available packages in repository '$REPO'."
 			schroot --run-session -c $SESSION --directory /var/abs/$REPO -- ls -1|sort -R|xargs echo > ${ARCHLINUX_PKGS}_$REPO
@@ -57,12 +57,14 @@ choose_package() {
 	schroot --end-session -c $SESSION
 	rm $DUMMY > /dev/null
 	local PKG
-	for REPO in core extra ; do
+	for REPO in $ARCHLINUX_REPOS ; do
 		case $REPO in
 			core)	MIN_AGE=6
 				;;
 			extra)	MIN_AGE=27
 				;;
+			*)	MIN_AGE=99	# should never happen…
+				;;
 		esac
 		for PKG in $(cat ${ARCHLINUX_PKGS}_$REPO) ; do
 			# build package if it has never build or at least $MIN_AGE days ago
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index dd07e725..f6a6bdec 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -52,6 +52,9 @@ BUILD_ENV_VARS="ARCH NUM_CPU CPU_MODEL DATETIME KERNEL1 KERNEL2" # these also ne
 # existing usertags in the Debian BTS
 USERTAGS="toolchain infrastructure timestamps fileordering buildpath username hostname uname randomness buildinfo cpu signatures environment umask ftbfs locale"
 
+# archlinux repositories to be tested
+ARCHLINUX_REPOS="extra core"
+
 # number of cores to be used
 NUM_CPU=$(grep -c '^processor' /proc/cpuinfo)
 
diff --git a/bin/reproducible_html_archlinux.sh b/bin/reproducible_html_archlinux.sh
index 04847ecc..c42b9972 100755
--- a/bin/reproducible_html_archlinux.sh
+++ b/bin/reproducible_html_archlinux.sh
@@ -38,7 +38,7 @@ EOF
 write_page_intro 'Arch Linux'
 write_explaination_table 'Arch Linux'
 write_page "    <table><tr><th>repository</th><th>source package</th><th>test result</th><th>test date</th><th>1st build log</th><th>2nd build log</th></tr>"
-for REPOSITORY in core extra ; do
+for REPOSITORY in $ARCHLINUX_REPOS ; do
 	for PKG in $(find $ARCHBASE/$REPOSITORY/* -maxdepth 1 -type d -exec basename {} \;) ; do
 		write_page "     <tr>"
 		write_page "      <td>$REPOSITORY</td>"