[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: configure _node_wrapper.sh and sudoers.d correctly

[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 cdf0f40d5b810958c95d68e3623a5827c89b7cf1
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Oct 13 00:11:07 2015 +0200

    reproducible: configure _node_wrapper.sh and sudoers.d correctly
---
 bin/jenkins_node_wrapper.sh                           |  4 +++-
 hosts/profitbricks-build3-amd64/etc/sudoers.d/jenkins | 15 +++++++++++++++
 job-cfg/reproducible.yaml                             |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh
index 3c54d2d..8286c4a 100755
--- a/bin/jenkins_node_wrapper.sh
+++ b/bin/jenkins_node_wrapper.sh
@@ -83,8 +83,10 @@ elif [[ "$*" =~ reproducible_setup_pbuilder_experimental_.*_.* ]] ; then
 	exec /srv/jenkins/bin/reproducible_setup_pbuilder.sh experimental ; croak "Exec failed";
 elif [[ "$*" =~ reproducible_maintenance_.*_.* ]] ; then
 	exec /srv/jenkins/bin/reproducible_maintenance.sh ; croak "Exec failed";
+elif [[ "$*" =~ reproducible_setup_schroot_unstable_diffoscope_.*_.* ]] ; then
+	exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable unstable diffoscope locales-all ; croak "Exec failed";
 elif [[ "$*" =~ reproducible_setup_schroot_unstable_.*_.* ]] ; then
-	exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable unstable ; croak "Exec failed";
+	exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable unstable botch ; croak "Exec failed";
 elif [[ "$*" =~ reproducible_setup_schroot_testing_.*_.* ]] ; then
 	exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-testing testing ; croak "Exec failed";
 elif [[ "$*" =~ reproducible_setup_schroot_experimental_.*_.* ]] ; then
diff --git a/hosts/profitbricks-build3-amd64/etc/sudoers.d/jenkins b/hosts/profitbricks-build3-amd64/etc/sudoers.d/jenkins
new file mode 100644
index 0000000..a0127b6
--- /dev/null
+++ b/hosts/profitbricks-build3-amd64/etc/sudoers.d/jenkins
@@ -0,0 +1,15 @@
+jenkins ALL=  \
+	NOPASSWD: /usr/sbin/debootstrap *, \
+	/usr/bin/tee /schroots/*, \
+	/usr/bin/tee -a /schroots/*, \
+	/usr/bin/tee /etc/schroot/chroot.d/jenkins*, \
+	/bin/chmod +x /schroots/*, \
+	/usr/sbin/chroot /schroots/*, \
+	/bin/rm -rf --one-file-system /schroots/*, \
+	/bin/rm -rf --one-file-system /srv/live-build/*, \
+	/bin/mv /schroots/* /schroots/*, \
+	/bin/umount -l /schroots/*, \
+	/bin/mount --bind * 
+
+# keep these environment variables
+Defaults        env_keep += "http_proxy", env_reset
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 7cd0709..1fa0d0c 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -762,7 +762,7 @@
         - '{name}_setup_schroot_unstable_diffoscope_amd64_jenkins':
             my_description: 'Setup schroot for running diffoscope in a unstable environment (this is needed to be able to correctly investigate haskell binaries...)'
             my_timed: '42 0 * * *'
-            my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-diffoscope unstable diffoscope locales-all'
+            my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
             my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
             my_node: ''
         - '{name}_setup_schroot_unstable_diffoscope_amd64_profitbricks3':

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