From dfd4ee1af0a6d7140a512e96fa92b184c688672b Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 1 Sep 2015 15:00:01 +0200 Subject: reproducible: we will only run diffoscope on the main node, so drop all the other jobs --- bin/jenkins_node_wrapper.sh | 16 --------- job-cfg/reproducible.yaml | 80 --------------------------------------------- 2 files changed, 96 deletions(-) diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh index c768eb34..c8a1466d 100755 --- a/bin/jenkins_node_wrapper.sh +++ b/bin/jenkins_node_wrapper.sh @@ -79,32 +79,24 @@ elif [ "$*" = "reproducible_setup_pbuilder_unstable_armhf_bpi0" ] ; then exec /srv/jenkins/bin/reproducible_setup_pbuilder.sh unstable ; croak "Exec failed"; elif [ "$*" = "reproducible_maintenance_armhf_bpi0" ] ; then exec /srv/jenkins/bin/reproducible_maintenance.sh ; croak "Exec failed"; -elif [ "$*" = "reproducible_setup_schroot_unstable_debbindiff_armhf_bpi0" ] ; then - exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-debbindiff unstable debbindiff locales-all ; croak "Exec failed"; elif [ "$*" = "reproducible_setup_schroot_unstable_armhf_bpi0" ] ; then exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable unstable ; croak "Exec failed"; elif [ "$*" = "reproducible_setup_pbuilder_unstable_armhf_cbxi4pro0" ] ; then exec /srv/jenkins/bin/reproducible_setup_pbuilder.sh unstable ; croak "Exec failed"; elif [ "$*" = "reproducible_maintenance_armhf_cbxi4pro0" ] ; then exec /srv/jenkins/bin/reproducible_maintenance.sh ; croak "Exec failed"; -elif [ "$*" = "reproducible_setup_schroot_unstable_debbindiff_armhf_cbxi4pro0" ] ; then - exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-debbindiff unstable debbindiff locales-all ; croak "Exec failed"; elif [ "$*" = "reproducible_setup_schroot_unstable_armhf_cbxi4pro0" ] ; then exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable unstable ; croak "Exec failed"; elif [ "$*" = "reproducible_setup_pbuilder_unstable_armhf_hb0" ] ; then exec /srv/jenkins/bin/reproducible_setup_pbuilder.sh unstable ; croak "Exec failed"; elif [ "$*" = "reproducible_maintenance_armhf_hb0" ] ; then exec /srv/jenkins/bin/reproducible_maintenance.sh ; croak "Exec failed"; -elif [ "$*" = "reproducible_setup_schroot_unstable_debbindiff_armhf_hb0" ] ; then - exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-debbindiff unstable debbindiff locales-all ; croak "Exec failed"; elif [ "$*" = "reproducible_setup_schroot_unstable_armhf_hb0" ] ; then exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable unstable ; croak "Exec failed"; elif [ "$*" = "reproducible_setup_pbuilder_unstable_armhf_wbq0" ] ; then exec /srv/jenkins/bin/reproducible_setup_pbuilder.sh unstable ; croak "Exec failed"; elif [ "$*" = "reproducible_maintenance_armhf_wbq0" ] ; then exec /srv/jenkins/bin/reproducible_maintenance.sh ; croak "Exec failed"; -elif [ "$*" = "reproducible_setup_schroot_unstable_debbindiff_armhf_wbq0" ] ; then - exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-debbindiff unstable debbindiff locales-all ; croak "Exec failed"; elif [ "$*" = "reproducible_setup_schroot_unstable_armhf_wbq0" ] ; then exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable unstable ; croak "Exec failed"; elif [ "$*" = "reproducible_setup_pbuilder_testing_amd64_profitbricks1" ] ; then @@ -115,10 +107,6 @@ elif [ "$*" = "reproducible_setup_pbuilder_experimental_amd64_profitbricks1" ] exec /srv/jenkins/bin/reproducible_setup_pbuilder.sh experimental ; croak "Exec failed"; elif [ "$*" = "reproducible_maintenance_amd64_profitbricks1" ] ; then exec /srv/jenkins/bin/reproducible_maintenance.sh ; croak "Exec failed"; -elif [ "$*" = "reproducible_setup_schroot_testing_debbindiff_amd64_profitbricks1" ] ; then - exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-testing-debbindiff testing debbindiff locales-all ; croak "Exec failed"; -elif [ "$*" = "reproducible_setup_schroot_unstable_debbindiff_amd64_profitbricks1" ] ; then - exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-debbindiff unstable debbindiff locales-all ; croak "Exec failed"; elif [ "$*" = "reproducible_setup_schroot_testing_amd64_profitbricks1" ] ; then exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-testing testing ; croak "Exec failed"; elif [ "$*" = "reproducible_setup_schroot_unstable_amd64_profitbricks1" ] ; then @@ -133,10 +121,6 @@ elif [ "$*" = "reproducible_setup_pbuilder_experimental_amd64_profitbricks2" ] exec /srv/jenkins/bin/reproducible_setup_pbuilder.sh experimental ; croak "Exec failed"; elif [ "$*" = "reproducible_maintenance_amd64_profitbricks2" ] ; then exec /srv/jenkins/bin/reproducible_maintenance.sh ; croak "Exec failed"; -elif [ "$*" = "reproducible_setup_schroot_testing_debbindiff_amd64_profitbricks2" ] ; then - exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-testing-debbindiff testing debbindiff locales-all ; croak "Exec failed"; -elif [ "$*" = "reproducible_setup_schroot_unstable_debbindiff_amd64_profitbricks2" ] ; then - exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-debbindiff unstable debbindiff locales-all ; croak "Exec failed"; elif [ "$*" = "reproducible_setup_schroot_testing_amd64_profitbricks2" ] ; then exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-testing testing ; croak "Exec failed"; elif [ "$*" = "reproducible_setup_schroot_unstable_amd64_profitbricks2" ] ; then diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index 9881a2cd..898c9df4 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -248,42 +248,10 @@ defaults: reproducible name: '{name}_setup_schroot_unstable_debbindiff' -- job-template: - defaults: reproducible - name: '{name}_setup_schroot_unstable_debbindiff_amd64_profitbricks1' - -- job-template: - defaults: reproducible - name: '{name}_setup_schroot_unstable_debbindiff_amd64_profitbricks2' - - job-template: defaults: reproducible name: '{name}_setup_schroot_testing_debbindiff' -- job-template: - defaults: reproducible - name: '{name}_setup_schroot_unstable_debbindiff_armhf_bpi0' - -- job-template: - defaults: reproducible - name: '{name}_setup_schroot_unstable_debbindiff_armhf_cbxi4pro0' - -- job-template: - defaults: reproducible - name: '{name}_setup_schroot_unstable_debbindiff_armhf_hb0' - -- job-template: - defaults: reproducible - name: '{name}_setup_schroot_unstable_debbindiff_armhf_wbq0' - -- job-template: - defaults: reproducible - name: '{name}_setup_schroot_testing_debbindiff_amd64_profitbricks1' - -- job-template: - defaults: reproducible - name: '{name}_setup_schroot_testing_debbindiff_amd64_profitbricks2' - - job-template: defaults: reproducible name: '{name}_setup_schroot_unstable' @@ -589,60 +557,12 @@ my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-debbindiff unstable debbindiff locales-all' my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' my_node: '' - - '{name}_setup_schroot_unstable_debbindiff_amd64_profitbricks1': - my_description: 'Setup schroot for running debbindiff in a unstable environment (this is needed to be able to correctly investigate haskell binaries...)' - my_timed: '23 0 * * *' - my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' - my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' - my_node: 'profitbricks1' - - '{name}_setup_schroot_unstable_debbindiff_amd64_profitbricks2': - my_description: 'Setup schroot for running debbindiff in a unstable environment (this is needed to be able to correctly investigate haskell binaries...)' - my_timed: '23 0 * * *' - my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' - my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' - my_node: 'profitbricks2' - '{name}_setup_schroot_testing_debbindiff': my_description: 'Setup schroot for running debbindiff in a testing environment (this is needed to be able to correctly investigate haskell binaries...)' my_timed: '23 0 * * *' my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-testing-debbindiff testing debbindiff locales-all' my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' my_node: '' - - '{name}_setup_schroot_unstable_debbindiff_armhf_bpi0': - my_description: 'Setup schroot for running debbindiff in a testing environment (this is needed to be able to correctly investigate haskell binaries...)' - my_timed: '23 0 * * *' - my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' - my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' - my_node: 'bpi0' - - '{name}_setup_schroot_unstable_debbindiff_armhf_cbxi4pro0': - my_description: 'Setup schroot for running debbindiff in a testing environment (this is needed to be able to correctly investigate haskell binaries...)' - my_timed: '23 0 * * *' - my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' - my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' - my_node: 'cbxi4pro0' - - '{name}_setup_schroot_unstable_debbindiff_armhf_hb0': - my_description: 'Setup schroot for running debbindiff in a testing environment (this is needed to be able to correctly investigate haskell binaries...)' - my_timed: '23 0 * * *' - my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' - my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' - my_node: 'hb0' - - '{name}_setup_schroot_unstable_debbindiff_armhf_wbq0': - my_description: 'Setup schroot for running debbindiff in a testing environment (this is needed to be able to correctly investigate haskell binaries...)' - my_timed: '23 0 * * *' - my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' - my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' - my_node: 'wbq0' - - '{name}_setup_schroot_testing_debbindiff_amd64_profitbricks1': - my_description: 'Setup schroot for running debbindiff in a testing environment (this is needed to be able to correctly investigate haskell binaries...)' - my_timed: '23 0 * * *' - my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' - my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' - my_node: 'profitbricks1' - - '{name}_setup_schroot_testing_debbindiff_amd64_profitbricks2': - my_description: 'Setup schroot for running debbindiff in a testing environment (this is needed to be able to correctly investigate haskell binaries...)' - my_timed: '23 0 * * *' - my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh' - my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' - my_node: 'profitbricks2' - '{name}_setup_schroot_unstable': my_description: 'Setup unstable schroot for fetching source packages for the builder jobs.' my_timed: '23 1 * * *' -- cgit v1.2.3-54-g00ecf