[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible arch: order is important, configure squid first

[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 971663f61d3f0635042bfc17c2f0bd4576885bb1
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Oct 17 05:02:55 2015 +0200

    reproducible arch: order is important, configure squid first
---
 bin/reproducible_arch_schroot_setup.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/bin/reproducible_arch_schroot_setup.sh b/bin/reproducible_arch_schroot_setup.sh
index 04a9fa2..be06024 100755
--- a/bin/reproducible_arch_schroot_setup.sh
+++ b/bin/reproducible_arch_schroot_setup.sh
@@ -59,18 +59,19 @@ trap - INT TERM EXIT
 ROOTCMD="schroot --directory /tmp -c source:jenkins-reproducible-arch -u root --"
 USERCMD="schroot --directory /tmp -c source:jenkins-reproducible-arch -u jenkins --"
 
-# configure pacman + abs
+# configure root user
+echo "export http_proxy=$http_proxy" | 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
 $ROOTCMD pacman -Syu --noconfirm
 $ROOTCMD pacman -S --noconfirm base-devel devtools abs
+# configure abs
+$ROOTCMD abs core extra
 # configure sudo
 echo 'jenkins ALL= NOPASSWD: /usr/sbin/pacman *' | $ROOTCMD tee -a $SCHROOT_BASE/$TARGET/etc/sudoers
-$ROOTCMD abs core extra
-
-# configure root user
-echo "export http_proxy=$http_proxy" | tee -a $SCHROOT_BASE/$TARGET/root/.bashrc
 
 # configure jenkins user
 $ROOTCMD mkdir /var/lib/jenkins

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