diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-10-13 00:11:07 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-10-13 00:11:07 +0200 |
| commit | cdf0f40d5b810958c95d68e3623a5827c89b7cf1 (patch) | |
| tree | d309c24042a9593f76c20110f3f7cf7c13335ca5 | |
| parent | 9d2b25f3ce3eb552f969f2a03bcccb5536ff71b7 (diff) | |
| download | jenkins.debian.net-cdf0f40d5b810958c95d68e3623a5827c89b7cf1.tar.xz | |
reproducible: configure _node_wrapper.sh and sudoers.d correctly
| -rwxr-xr-x | bin/jenkins_node_wrapper.sh | 4 | ||||
| -rw-r--r-- | hosts/profitbricks-build3-amd64/etc/sudoers.d/jenkins | 15 | ||||
| -rw-r--r-- | 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 3c54d2dc..8286c4a9 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 00000000..a0127b67 --- /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 7cd07095..1fa0d0c5 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@lists.alioth.debian.org' my_node: '' - '{name}_setup_schroot_unstable_diffoscope_amd64_profitbricks3': |