summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2016-07-31 01:14:43 +0200
committerHolger Levsen <holger@layer-acht.org>2016-08-02 16:24:25 +0200
commit6b30663410f3f1093194e37a3bdd0ed57648fcd8 (patch)
tree54f4672ae2a2b9ca63160e799b9cb067d8817c80
parent4960398d1165014a3cdaa0d17bc4a0da44643390 (diff)
downloadjenkins.debian.net-6b30663410f3f1093194e37a3bdd0ed57648fcd8.tar.xz
reproducible/openwrt|lede: fix remote node execution
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rwxr-xr-xbin/jenkins_node_wrapper.sh4
-rw-r--r--bin/reproducible_openwrt_common.sh10
2 files changed, 7 insertions, 7 deletions
diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh
index 12f7085c..85941170 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 master ; croak "Exec failed";
+ shift ; exec /srv/jenkins/bin/reproducible_openwrt.sh $@ ; croak "Exec failed";
elif [[ "$*" =~ ^reproducible_lede ]] ; then
- exec /srv/jenkins/bin/reproducible_lede.sh master ; croak "Exec failed";
+ shift ; exec /srv/jenkins/bin/reproducible_lede.sh $@ ; 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_openwrt_common.sh b/bin/reproducible_openwrt_common.sh
index 7c47d539..64e341c1 100644
--- a/bin/reproducible_openwrt_common.sh
+++ b/bin/reproducible_openwrt_common.sh
@@ -262,20 +262,20 @@ build_two_times() {
## first run
RUN=b1
TMPDIR_B1=$(ssh $GENERIC_NODE1 reproducible_$TYPE node openwrt_mktempdir)
- ssh $GENERIC_NODE1 $0 node openwrt_build $TYPE $RUN $TARGET $CONFIG $TMPDIR_B1
+ ssh $GENERIC_NODE1 reproducible_$TYPE node openwrt_build $TYPE $RUN $TARGET $CONFIG $TMPDIR_B1
- ssh $GENERIC_NODE1 $0 node openwrt_get_banner $TMPDIR_B1 $TYPE > $BANNER_HTML
+ ssh $GENERIC_NODE1 reproducible_$TYPE node openwrt_get_banner $TMPDIR_B1 $TYPE > $BANNER_HTML
# rsync back logs and images
rsync -a $GENERIC_NODE1:$TMPDIR_B1/$RUN/ $TMPDIR/$RUN/
- ssh $GENERIC_NODE1 $0 node openwrt_cleanup_tmpdirs $TMPDIR_B1
+ ssh $GENERIC_NODE1 reproducible_$TYPE node openwrt_cleanup_tmpdirs $TMPDIR_B1
## second run
RUN=b2
TMPDIR_B2=$(ssh $GENERIC_NODE2 reproducible_$TYPE node openwrt_mktempdir)
- ssh $GENERIC_NODE2 $0 node openwrt_build $TYPE $RUN $TARGET $CONFIG $TMPDIR_B2
+ ssh $GENERIC_NODE2 reproducible_$TYPE node openwrt_build $TYPE $RUN $TARGET $CONFIG $TMPDIR_B2
# rsync back logs and images
rsync -a $GENERIC_NODE2:$TMPDIR_B2/$RUN/ $TMPDIR/$RUN/
- ssh $GENERIC_NODE2 $0 node openwrt_cleanup_tmpdirs $TMPDIR_B2
+ ssh $GENERIC_NODE2 reproducible_$TYPE node openwrt_cleanup_tmpdirs $TMPDIR_B2
}