summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2016-07-30 03:15:52 +0200
committerHolger Levsen <holger@layer-acht.org>2016-07-30 15:37:30 -0400
commitd13c865881de1adbbf9e3973a1271fbf1e2e4891 (patch)
treebfe9ba0d98f318982efd01f952b8e08f561f86d6
parent52531c464ec98d25613fc54ba82fcb89f499c744 (diff)
downloadjenkins.debian.net-d13c865881de1adbbf9e3973a1271fbf1e2e4891.tar.xz
reproducible/openwrt|lede: allow to execute the script itself
To call function on a remote host, allow to call itself on a remote host with different arguments Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rwxr-xr-xbin/jenkins_node_wrapper.sh4
-rwxr-xr-xbin/reproducible_lede.sh15
-rwxr-xr-xbin/reproducible_openwrt.sh15
3 files changed, 32 insertions, 2 deletions
diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh
index 53c2a8d3..12f7085c 100755
--- a/bin/jenkins_node_wrapper.sh
+++ b/bin/jenkins_node_wrapper.sh
@@ -118,9 +118,9 @@ elif [[ "$*" =~ ^reproducible_setup_schroot_experimental_.*_.* ]] ; then
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 ; croak "Exec failed";
+ exec /srv/jenkins/bin/reproducible_openwrt.sh master ; croak "Exec failed";
elif [[ "$*" =~ ^reproducible_lede ]] ; then
- exec /srv/jenkins/bin/reproducible_lede.sh ; croak "Exec failed";
+ exec /srv/jenkins/bin/reproducible_lede.sh master ; 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 f68b1c0a..05aaa6da 100755
--- a/bin/reproducible_lede.sh
+++ b/bin/reproducible_lede.sh
@@ -16,6 +16,21 @@ common_init "$@"
. /srv/jenkins/bin/reproducible_openwrt_common.sh
set -e
+# this script is called from positions
+# * 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
+ $@
+ exit $?
+ ;;
+ master)
+ # master code following
+ ;;
+esac
+
#
# main
#
diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh
index 095a5eed..a5fab82c 100755
--- a/bin/reproducible_openwrt.sh
+++ b/bin/reproducible_openwrt.sh
@@ -16,6 +16,21 @@ common_init "$@"
. /srv/jenkins/bin/reproducible_openwrt_common.sh
set -e
+# this script is called from positions
+# * 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
+ $@
+ exit $?
+ ;;
+ master)
+ # master code following
+ ;;
+esac
+
#
# main
#