[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible alpine: 2nd build might be in the future too

[Mattia Rizzolo]

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


Commits:
5ee25a02 by kpcyrd at 2019-12-03T19:54:38Z
reproducible alpine: 2nd build might be in the future too

- - - - -
95eb84e6 by Mattia Rizzolo at 2019-12-03T19:59:05Z
reproducible: introduce a dsources view to simplify some queries

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


2 changed files:

- bin/reproducible_build_alpine_pkg.sh
- bin/reproducible_db_maintenance.py


Changes:

=====================================
bin/reproducible_build_alpine_pkg.sh
=====================================
@@ -201,13 +201,14 @@ second_build() {
 	local FUTURE_STATE="disabled"
 	if [ "$(hostname)" = "osuosl-build170-amd64" ] ; then
 		FUTURE_STATE="enabled"
+		GIT_OPTIONS='GIT_SSL_NO_VERIFY=1'
 	fi
 	echo "Future:            $FUTURE_STATE"
 	echo "SOURCE_DATE_EPOCH: $SOURCE_DATE_EPOCH"
 	echo "============================================================================="
 	schroot --begin-session --session-name=$SESSION -c jenkins-reproducible-alpine
 	echo "MAKEFLAGS=-j$NEW_NUM_CPU" | schroot --run-session -c $SESSION --directory /tmp -u root -- tee -a /etc/abuild.conf
-	schroot --run-session -c $SESSION --directory "/var/lib/jenkins/aports" -- git pull
+	schroot --run-session -c $SESSION --directory "/var/lib/jenkins/aports" -- sh -c "$GIT_OPTIONS git pull"
 	# add more variations in the 2nd build: TZ (differently), LANG, LC_ALL, umask
 	schroot --run-session -c $SESSION --directory /tmp -- tee -a /var/lib/jenkins/.bashrc <<-__END__
 	export TZ="/usr/share/zoneinfo/Etc/GMT-14"


=====================================
bin/reproducible_db_maintenance.py
=====================================
@@ -749,6 +749,12 @@ schema_updates = {
         "UPDATE stats_build SET suite='community' WHERE suite='archlinux_community'",
         "UPDATE stats_build SET suite='multilib' WHERE suite='archlinux_multilib'",
     ],
+    49: [  # create a dsources view
+        """CREATE VIEW dsources AS
+            SELECT s.id AS package_id, s.name, s.version, s.suite,
+                s.architecture, s.notify_maintainer, d.name AS distribution
+            FROM sources s JOIN distributions d on s.distribution=d.id""",
+    ],
 }
 
 



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/7677b378ddc2ad6b24676a219e93bf33de2977d6...95eb84e6842e48cdaeea3199319f94bfa7139332

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/7677b378ddc2ad6b24676a219e93bf33de2977d6...95eb84e6842e48cdaeea3199319f94bfa7139332
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/b38e4a6b/attachment-0001.html>