[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Arch Linux: sed is not available in the bootstrap.tar.gz, thus use Debian's with sudo

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
8db9c2da by Holger Levsen at 2019-01-12T20:44:43Z
reproducible Arch Linux: sed is not available in the bootstrap.tar.gz, thus use Debian's with sudo

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


2 changed files:

- bin/reproducible_setup_archlinux_schroot.sh
- hosts/common/etc/sudoers.d/jenkins


Changes:

=====================================
bin/reproducible_setup_archlinux_schroot.sh
=====================================
@@ -101,7 +101,7 @@ sudo tee $SCHROOT_BASE/$TARGET/etc/profile.d/proxy.sh <<-__END__
 	export no_proxy="localhost,127.0.0.1"
 	__END__
 sudo chmod +x $SCHROOT_BASE/$TARGET/etc/profile.d/proxy.sh
-$ROOTCMD sed -i "s|^#XferCommand = /usr/bin/curl |XferCommand = /usr/bin/curl --proxy $http_proxy |" "$SCHROOT_BASE/$TARGET/etc/pacman.conf"
+sudo sed -i "s|^#XferCommand = /usr/bin/curl |XferCommand = /usr/bin/curl --proxy $http_proxy |" "$SCHROOT_BASE/$TARGET/etc/pacman.conf"
 
 # configure root user to use this for shells and login shells…
 echo ". /etc/profile.d/proxy.sh" | sudo tee -a $SCHROOT_BASE/$TARGET/root/.bashrc
@@ -112,11 +112,11 @@ $ROOTCMD bash -l -c 'pacman-key --populate archlinux'
 # use a specific mirror
 echo "Server = $ARCHLINUX_MIRROR/\$repo/os/\$arch" | tee -a $SCHROOT_BASE/$TARGET/etc/pacman.d/mirrorlist
 # enable multilib (by uncommenting the first two lines starting with the [multilib] section header)
-$ROOTCMD sed -i '/\[multilib\]/,+1{s/^#//}' $SCHROOT_BASE/$TARGET/etc/pacman.conf
+sudo sed -i '/\[multilib\]/,+1{s/^#//}' $SCHROOT_BASE/$TARGET/etc/pacman.conf
 if [ "$HOSTNAME" = "profitbricks-build4-amd64" ] ; then
 	# disable signature verification so packages won't fail to install when setting the time to +$x years
-	$ROOTCMD sed -i -E 's/^#?SigLevel\s*=.*/SigLevel = Never/g' "$SCHROOT_BASE/$TARGET/etc/pacman.conf"
-	$ROOTCMD sed -i "/^XferCommand = /{s|/usr/bin/curl |/usr/bin/curl --insecure |}" "$SCHROOT_BASE/$TARGET/etc/pacman.conf"
+	sudo sed -i -E 's/^#?SigLevel\s*=.*/SigLevel = Never/g' "$SCHROOT_BASE/$TARGET/etc/pacman.conf"
+	sudo sed -i "/^XferCommand = /{s|/usr/bin/curl |/usr/bin/curl --insecure |}" "$SCHROOT_BASE/$TARGET/etc/pacman.conf"
 fi
 
 echo "============================================================================="


=====================================
hosts/common/etc/sudoers.d/jenkins
=====================================
@@ -4,6 +4,7 @@ jenkins ALL=  \
 	/usr/bin/tee -a /schroots/*, \
 	/usr/bin/tee /etc/schroot/chroot.d/jenkins*, \
 	/usr/bin/tee -a /etc/schroot/chroot.d/jenkins*, \
+	/bin/sed -i * /schroots/reproducible-archlinux/etc/pacman.conf, \
 	/bin/chmod +x /schroots/*, \
 	/bin/chmod +x /chroots/*, \
 	/bin/tar -c --exclude ./sys/\* --exclude ./proc/\* -f /schroots/*, \



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/8db9c2dadae89f05259f0f9de6615e310f218b30

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/8db9c2dadae89f05259f0f9de6615e310f218b30
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20190112/d2ae093e/attachment-0001.html>