[Qa-jenkins-scm] [jenkins.debian.net] 02/02: reproducible arch: refactor, define mirror once

[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 7a65d0cd47f228452261ad2996a91ecd7cf94284
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Oct 17 15:23:18 2015 +0200

    reproducible arch: refactor, define mirror once
---
 bin/reproducible_arch_schroot_setup.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_arch_schroot_setup.sh b/bin/reproducible_arch_schroot_setup.sh
index 6633346..4594667 100755
--- a/bin/reproducible_arch_schroot_setup.sh
+++ b/bin/reproducible_arch_schroot_setup.sh
@@ -12,11 +12,12 @@ DEBUG=true
 . /srv/jenkins/bin/common-functions.sh
 common_init "$@"
 
-
+# define archlinux mirror to be used
+ARCH_MIRROR=http://mirror.one.com/archlinux/
 
 bootstrap() {
 	# define URL for bootstrap.tgz
-	BOOTSTRAP_BASE=http://mirror.one.com/archlinux/iso/
+	BOOTSTRAP_BASE=$ARCH_MIRROR/iso/
 	echo "$(date -u) - downloading Archlinux latest/sha1sums.txt"
 	BOOTSTRAP_DATE=$(curl $BOOTSTRAP_BASE/latest/sha1sums.txt 2>/dev/null| grep x86_64.tar.gz| cut -d " " -f3|cut -d "-" -f3|egrep '[0-9.]{9}')
 	if [ -z $BOOTSTRAP_DATE ] ; then
@@ -85,7 +86,7 @@ echo ". /etc/profile.d/proxy.sh" | tee -a $SCHROOT_BASE/$TARGET/root/.bashrc
 # configure pacman
 $ROOTCMD pacman-key --init
 $ROOTCMD pacman-key --populate archlinux
-echo 'Server = http://mirror.one.com/archlinux/$repo/os/$arch' | tee -a $SCHROOT_BASE/$TARGET/etc/pacman.d/mirrorlist
+echo "Server = $ARCH_MIRROR/\$repo/os/\$arch" | tee -a $SCHROOT_BASE/$TARGET/etc/pacman.d/mirrorlist
 $ROOTCMD pacman -Syu --noconfirm
 $ROOTCMD pacman -S --noconfirm base-devel devtools abs
 # configure abs

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