summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-07-30 15:46:58 -0400
committerHolger Levsen <holger@layer-acht.org>2016-07-30 15:46:58 -0400
commit8d586d5c9968778c934996aa59626635fc20b99f (patch)
tree12d90eca8efc96eb8319b3d2902fb84dc3e73770 /bin
parentb8b43df488c513bb550177e571a7119bbf24cfd3 (diff)
downloadjenkins.debian.net-8d586d5c9968778c934996aa59626635fc20b99f.tar.xz
reproducible/openwrt|lede: fixup node_wrapper usage
Diffstat (limited to 'bin')
-rwxr-xr-xbin/jenkins_node_wrapper.sh8
-rwxr-xr-xbin/reproducible_lede.sh7
-rwxr-xr-xbin/reproducible_openwrt.sh7
-rw-r--r--bin/reproducible_openwrt_common.sh13
4 files changed, 16 insertions, 19 deletions
diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh
index 12f7085c..15c0e0d3 100755
--- a/bin/jenkins_node_wrapper.sh
+++ b/bin/jenkins_node_wrapper.sh
@@ -117,10 +117,10 @@ elif [[ "$*" =~ ^reproducible_setup_schroot_experimental_.*_.* ]] ; then
exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-experimental experimental ; croak "Exec failed";
elif [[ "$*" =~ ^reproducible_coreboot ]] ; then
exec /srv/jenkins/bin/reproducible_coreboot.sh ; croak "Exec failed";
-elif [[ "$*" =~ ^reproducible_openwrt ]] ; then
- exec /srv/jenkins/bin/reproducible_openwrt.sh master ; croak "Exec failed";
-elif [[ "$*" =~ ^reproducible_lede ]] ; then
- exec /srv/jenkins/bin/reproducible_lede.sh master ; croak "Exec failed";
+elif [ "$1" = "/srv/jenkins/bin/reproducible_openwrt.sh" ] && ( [ "$2" = "master" ] || [ "$2" = "1" ] || [ "$2" = "2" ] ) ; then
+ exec /srv/jenkins/bin/reproducible_openwrt.sh "$2" "$3" "$4" "$5" "$6" "$7" "$8" ; croak "Exec failed";
+elif [ "$1" = "/srv/jenkins/bin/reproducible_lede.sh" ] && ( [ "$2" = "master" ] || [ "$2" = "1" ] || [ "$2" = "2" ] ) ; then
+ exec /srv/jenkins/bin/reproducible_lede.sh "$2" "$3" "$4" "$5" "$6" "$7" "$8" ; croak "Exec failed";
elif [[ "$*" =~ ^reproducible_netbsd ]] ; then
exec /srv/jenkins/bin/reproducible_netbsd.sh ; croak "Exec failed";
elif [[ "$*" =~ ^reproducible_freebsd ]] ; then
diff --git a/bin/reproducible_lede.sh b/bin/reproducible_lede.sh
index 534056c4..b7e7a9f1 100755
--- a/bin/reproducible_lede.sh
+++ b/bin/reproducible_lede.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2014-2015 Holger Levsen <holger@layer-acht.org>
+# Copyright 2014-2016 Holger Levsen <holger@layer-acht.org>
# © 2015 Reiner Herrmann <reiner@reiner-h.de>
# 2016 Alexander Couzens <lynxis@fe80.eu>
# released under the GPLv=2
@@ -20,9 +20,8 @@ set -e
# * it's called from the reproducible_wrapper when running on the master
# * it's called from reproducible_opewnrt_common when doing remote builds
case $1 in
- slave)
- # execute the slave
- shift
+ 1|2)
+ # execute build 1 or 2
$@
exit $?
;;
diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh
index d3435900..495b0536 100755
--- a/bin/reproducible_openwrt.sh
+++ b/bin/reproducible_openwrt.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2014-2015 Holger Levsen <holger@layer-acht.org>
+# Copyright 2014-2016 Holger Levsen <holger@layer-acht.org>
# © 2015 Reiner Herrmann <reiner@reiner-h.de>
# 2016 Alexander Couzens <lynxis@fe80.eu>
# released under the GPLv=2
@@ -20,9 +20,8 @@ set -e
# * it's called from the reproducible_wrapper when running on the master
# * it's called from reproducible_opewnrt_common when doing remote builds
case $1 in
- slave)
- # execute the slave
- shift
+ 1|2)
+ # execute build 1 or 2
$@
exit $?
;;
diff --git a/bin/reproducible_openwrt_common.sh b/bin/reproducible_openwrt_common.sh
index b3f4e314..32a814eb 100644
--- a/bin/reproducible_openwrt_common.sh
+++ b/bin/reproducible_openwrt_common.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2014-2015 Holger Levsen <holger@layer-acht.org>
+# Copyright 2014-2016 Holger Levsen <holger@layer-acht.org>
# © 2015 Reiner Herrmann <reiner@reiner-h.de>
# 2016 Alexander Couzens <lynxis@fe80.eu>
# released under the GPLv=2
@@ -258,21 +258,20 @@ build_two_times() {
TMPDIR_B1=$(ssh $HOST_B1 mktemp --tmpdir=/srv/workspace/chroots/ -d -t rbuild-lede-build-XXXXXXXX)
# TODO check tmpdir exist
- SCRIPT="$0 slave"
- ssh $HOST_B1 $SCRIPT openwrt_build $TYPE $RUN $TARGET $CONFIG $TMPDIR_B1
+ ssh $HOST_B1 $0 openwrt_build $TYPE $RUN $TARGET $CONFIG $TMPDIR_B1
# rsync back
# copy logs and images
rsync -a $HOST_B1:$TMPDIR_B1/$RUN/ $TMPDIR/$RUN/
- ssh $HOST_B1 $SCRIPT openwrt_get_banner $TMPDIR_B1 $TYPE > $BANNER_HTML
- ssh $HOST_B1 $SCRIPT openwrt_cleanup_tmpdirs $TMPDIR_B1
+ ssh $HOST_B1 $0 openwrt_get_banner $TMPDIR_B1 $TYPE > $BANNER_HTML
+ ssh $HOST_B1 $0 openwrt_cleanup_tmpdirs $TMPDIR_B1
## HOST_B2
RUN=b2
TMPDIR_B2=$(ssh $HOST_A mktemp --tmpdir=/srv/workspace/chroots/ -d -t rbuild-lede-build-XXXXXXXX)
- ssh $HOST_B2 $SCRIPT openwrt_build $TYPE $RUN $TARGET $CONFIG $TMPDIR_B2
+ ssh $HOST_B2 $0 openwrt_build $TYPE $RUN $TARGET $CONFIG $TMPDIR_B2
rsync -a $HOST_B2:$TMPDIR_B2/$RUN/ $TMPDIR/$RUN/
- ssh $HOST_B2 $SCRIPT openwrt_cleanup_tmpdirs $TMPDIR_B2
+ ssh $HOST_B2 $0 openwrt_cleanup_tmpdirs $TMPDIR_B2
}