[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible_fdroid: skip libvirt sudo command if not running libvirt

[Holger Levsen]

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


Commits:
3d3ad562 by Hans-Christoph Steiner at 2020-10-29T17:04:30+01:00
reproducible_fdroid: skip libvirt sudo command if not running libvirt

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

- - - - -
cef63c34 by Hans-Christoph Steiner at 2020-10-29T17:04:37+01:00
reproducible_fdroid: use direct URLs, eliminate redirect

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

- - - - -


3 changed files:

- bin/reproducible_fdroid_build_apps.sh
- bin/reproducible_fdroid_test.sh
- bin/reproducible_setup_fdroid_build_environment.sh


Changes:

=====================================
bin/reproducible_fdroid_build_apps.sh
=====================================
@@ -15,7 +15,7 @@ common_init "$@"
 # common code
 . /srv/jenkins/bin/reproducible_common.sh
 
-GIT_REPO=https://gitlab.com/fdroid/fdroidserver
+GIT_REPO=https://gitlab.com/fdroid/fdroidserver.git
 
 # define and clean work space on the machine actually running the
 # build. jenkins.debian.net does not use Jenkins agents.  Instead


=====================================
bin/reproducible_fdroid_test.sh
=====================================
@@ -15,7 +15,7 @@ common_init "$@"
 # common code
 . /srv/jenkins/bin/reproducible_common.sh
 
-GIT_REPO=https://gitlab.com/fdroid/fdroidserver
+GIT_REPO=https://gitlab.com/fdroid/fdroidserver.git
 
 # define and clean work space on the machine actually running the
 # build. jenkins.debian.net does not use Jenkins agents.  Instead


=====================================
bin/reproducible_setup_fdroid_build_environment.sh
=====================================
@@ -15,7 +15,7 @@ common_init "$@"
 # common code
 . /srv/jenkins/bin/reproducible_common.sh
 
-GIT_REPO=https://gitlab.com/fdroid/fdroidserver
+GIT_REPO=https://gitlab.com/fdroid/fdroidserver.git
 
 # define and clean work space on the machine actually running the
 # build. jenkins.debian.net does not use Jenkins agents.  Instead
@@ -57,9 +57,11 @@ if systemd-detect-virt -q ; then
 else
         echo "No virtualization is used."
 fi
-sudo /bin/chmod -R a+rX /var/lib/libvirt/images
-ls -ld /var/lib/libvirt/images
-ls -l /var/lib/libvirt/images || echo no access
+if test -d /var/lib/libvirt/images; then
+    sudo /bin/chmod -R a+rX /var/lib/libvirt/images
+    ls -ld /var/lib/libvirt/images
+    ls -l /var/lib/libvirt/images || echo no access
+fi
 ls -lR ~/.vagrant.d/ || echo no access
 virsh --connect qemu:///system list --all || echo cannot virsh list
 cat /etc/issue



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/e24681468b5f585b66e94ee5bb989115c317f55c...cef63c34012a23aeed34186aca868ec7f2001168

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/e24681468b5f585b66e94ee5bb989115c317f55c...cef63c34012a23aeed34186aca868ec7f2001168
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/20201029/e1f0bd4a/attachment-0001.html>