From ec22c5baa14105f42077305731569d091180f906 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 1 Sep 2015 15:19:06 +0200 Subject: refactor, avoid duplication --- bin/jenkins_node_wrapper.sh | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh index c8a1466d..d77a96c1 100755 --- a/bin/jenkins_node_wrapper.sh +++ b/bin/jenkins_node_wrapper.sh @@ -75,36 +75,28 @@ elif [[ "$*" =~ rsync\ --server\ --sender\ .*\ .\ /srv/reproducible-results/tmp. exec rsync --server --sender $4 . $6 ; croak "Exec failed"; elif [[ "$*" =~ rm\ -r\ /srv/reproducible-results/tmp.* ]] ; then exec rm -r $3 ; croak "Exec failed"; -elif [ "$*" = "reproducible_setup_pbuilder_unstable_armhf_bpi0" ] ; then +elif [[ "$*" =~ reproducible_setup_pbuilder_unstable_.*_.* ]] ; then exec /srv/jenkins/bin/reproducible_setup_pbuilder.sh unstable ; croak "Exec failed"; +elif [[ "$*" =~ reproducible_setup_pbuilder_testing_.*_.* ]] ; then + exec /srv/jenkins/bin/reproducible_setup_pbuilder.sh testing ; croak "Exec failed"; +elif [[ "$*" =~ reproducible_setup_pbuilder_experimental_.*_.* ]] ; then + exec /srv/jenkins/bin/reproducible_setup_pbuilder.sh experimental ; croak "Exec failed"; elif [ "$*" = "reproducible_maintenance_armhf_bpi0" ] ; then exec /srv/jenkins/bin/reproducible_maintenance.sh ; 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_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_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_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 - exec /srv/jenkins/bin/reproducible_setup_pbuilder.sh testing ; croak "Exec failed"; -elif [ "$*" = "reproducible_setup_pbuilder_unstable_amd64_profitbricks1" ] ; then - exec /srv/jenkins/bin/reproducible_setup_pbuilder.sh unstable ; croak "Exec failed"; -elif [ "$*" = "reproducible_setup_pbuilder_experimental_amd64_profitbricks1" ] ; then - 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_amd64_profitbricks1" ] ; then @@ -113,12 +105,6 @@ elif [ "$*" = "reproducible_setup_schroot_unstable_amd64_profitbricks1" ] ; then exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable unstable ; croak "Exec failed"; elif [ "$*" = "reproducible_setup_schroot_experimental_amd64_profitbricks1" ] ; then exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-experimental experimental ; croak "Exec failed"; -elif [ "$*" = "reproducible_setup_pbuilder_testing_amd64_profitbricks2" ] ; then - exec /srv/jenkins/bin/reproducible_setup_pbuilder.sh testing ; croak "Exec failed"; -elif [ "$*" = "reproducible_setup_pbuilder_unstable_amd64_profitbricks2" ] ; then - exec /srv/jenkins/bin/reproducible_setup_pbuilder.sh unstable ; croak "Exec failed"; -elif [ "$*" = "reproducible_setup_pbuilder_experimental_amd64_profitbricks2" ] ; then - 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_amd64_profitbricks2" ] ; then -- cgit v1.2.3-70-g09d2