diff options
| -rwxr-xr-x | bin/reproducible_build.sh | 4 | ||||
| -rw-r--r-- | job-cfg/reproducible.yaml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 5e22f664..8dd1065c 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -64,8 +64,8 @@ call_debbindiff() { # write locks are only done by the schroot setup job touch $DBDCHROOT_READLOCK fi - echo "$(date) - $(schroot --directory /tmp -c source:jenkins-reproducible-sid debbindiff -- --version) will be used to compare the two builds now." | tee -a ${RBUILDLOG} - ( timeout 15m schroot --directory /tmp -c source:jenkins-reproducible-sid debbindiff -- --html $TMPDIR/${LOGFILE} $TMPDIR/b1/${SRCPACKAGE}_${EVERSION}_amd64.changes $TMPDIR/b2/${SRCPACKAGE}_${EVERSION}_amd64.changes ) 2>&1 >> ${RBUILDLOG} + echo "$(date) - $(schroot --directory /tmp -c source:jenkins-reproducible-sid-debbindiff debbindiff -- --version) will be used to compare the two builds now." | tee -a ${RBUILDLOG} + ( timeout 15m schroot --directory /tmp -c source:jenkins-reproducible-sid-debbindiff debbindiff -- --html $TMPDIR/${LOGFILE} $TMPDIR/b1/${SRCPACKAGE}_${EVERSION}_amd64.changes $TMPDIR/b2/${SRCPACKAGE}_${EVERSION}_amd64.changes ) 2>&1 >> ${RBUILDLOG} RESULT=$? set +x set -e diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index 38965606..57180cfc 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -129,7 +129,7 @@ - job-template: defaults: reproducible - name: '{name}_setup_schroot' + name: '{name}_setup_schroot_sid_debbindiff' - job-template: defaults: reproducible @@ -199,10 +199,10 @@ my_timed: '23 0 * * *' my_shell: '/srv/jenkins/bin/reproducible_setup_pbuilder.sh' my_recipients: 'jenkins+debian-reproducible holger@layer-acht.org' - - '{name}_setup_schroot': + - '{name}_setup_schroot_sid_debbindiff': my_description: 'Setup schroot for running debbindiff in a sid environment (this is needed to be able to correctly investigate haskell binaries...)' my_timed: '23 0 * * *' - my_shell: '/srv/jenkins/bin/reproducible_setup_schroot.sh reproducible-sid sid debbindiff' + my_shell: '/srv/jenkins/bin/reproducible_setup_schroot.sh reproducible-sid-debbindiff sid debbindiff' my_recipients: 'holger@layer-acht.org' - '{name}_scheduler': my_description: 'Schedule packages to be tested for reproducibility.' |