[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: reproducible alpine: do not pull full aports git history

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
bc03526e by kpcyrd at 2019-12-03T18:51:49Z
reproducible alpine: do not pull full aports git history

- - - - -
71380c9a by kpcyrd at 2019-12-03T18:51:49Z
reproducible alpine: set environment for future builds in one place

- - - - -
a8815060 by kpcyrd at 2019-12-03T18:51:49Z
reproducible alpine: fix $PATH issues

- - - - -


1 changed file:

- bin/reproducible_setup_alpine_schroot.sh


Changes:

=====================================
bin/reproducible_setup_alpine_schroot.sh
=====================================
@@ -109,6 +109,7 @@ if [ "$HOSTNAME" = "osuosl-build170-amd64" ] ; then
 	# workaround for certificates that aren't valid in the future.
 	# we might need to replace this with a mitm proxy in the future
 	echo "insecure" | tee -a "$SCHROOT_BASE/$TARGET/var/lib/jenkins/.curlrc"
+	GIT_OPTIONS='GIT_SSL_NO_VERIFY=1'
 fi
 $USERCMD gpg --check-trustdb # first run will create ~/.gnupg/gpg.conf
 echo "keyserver-options auto-key-retrieve" | tee -a "$SCHROOT_BASE/$TARGET/var/lib/jenkins/.gnupg/gpg.conf"
@@ -159,16 +160,11 @@ wQIDAQAB
 -----END PUBLIC KEY-----
 __END__
 
-# Disable SSL verification for future builds
-if [ "$HOSTNAME" = "osuosl-build170-amd64" ] ; then
-	GIT_OPTIONS='GIT_SSL_NO_VERIFY=1'
-fi
-
 echo "$(date -u) - cloning aports repo"
-$USERCMD sh -c "$GIT_OPTIONS git clone https://git.alpinelinux.org/aports.git /var/lib/jenkins/aports"
+$USERCMD sh -c "$GIT_OPTIONS git clone --depth=1 https://git.alpinelinux.org/aports.git /var/lib/jenkins/aports"
 
 # build and install a patched abuild
-$USERCMD sh -c "cd /var/lib/jenkins/aports/main/abuild && base64 -d | git apply - && abuild -r && apk add ~/packages/main/x86_64/abuild-3.5.0_rc2-r1.apk && git checkout ." <<-__END__
+$USERCMD sh -c "cd /var/lib/jenkins/aports/main/abuild && base64 -d | git apply - && PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' abuild -r && sudo /sbin/apk add ~/packages/main/x86_64/abuild-3.5.0_rc2-r1.apk && git checkout ." <<-__END__
 ZGlmZiAtLWdpdCBhL21haW4vYWJ1aWxkLzAwMDItcmVwcm8ucGF0Y2ggYi9tYWluL2FidWlsZC8w
 MDAyLXJlcHJvLnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwLi41ZmYy
 MjAxMwotLS0gL2Rldi9udWxsCisrKyBiL21haW4vYWJ1aWxkLzAwMDItcmVwcm8ucGF0Y2gKQEAg



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/7a0295e8ef9dd28c2250b2d418f8b279b875929e...a88150601a1fda8717869b6baefe162a873cc945

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/7a0295e8ef9dd28c2250b2d418f8b279b875929e...a88150601a1fda8717869b6baefe162a873cc945
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/20191203/28c4e1dc/attachment-0001.html>