summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2016-07-30 22:28:01 +0200
committerHolger Levsen <holger@layer-acht.org>2016-08-02 16:24:25 +0200
commiteea8870197ce9f52ba11dece665f64d13b32b7b8 (patch)
tree31e6f5a071f0b352ae860de5436dd9ed32e8b0ed
parentdde8784fddd0b3e9c12be875e22012554195215e (diff)
downloadjenkins.debian.net-eea8870197ce9f52ba11dece665f64d13b32b7b8.tar.xz
reproducible/openwrt|lede: build_two_times(): improve formatting and comments
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rw-r--r--bin/reproducible_openwrt_common.sh14
1 files changed, 6 insertions, 8 deletions
diff --git a/bin/reproducible_openwrt_common.sh b/bin/reproducible_openwrt_common.sh
index f385eabf..53682aff 100644
--- a/bin/reproducible_openwrt_common.sh
+++ b/bin/reproducible_openwrt_common.sh
@@ -255,25 +255,23 @@ build_two_times() {
TARGET=$2
CONFIG=$3
- ## GENERIC_NODE1
+ ## first run
RUN=b1
TMPDIR_B1=$(ssh $GENERIC_NODE1 mktemp --tmpdir=/srv/workspace/chroots/ -d -t rbuild-lede-build-XXXXXXXX)
- # TODO check tmpdir exist
-
ssh $GENERIC_NODE1 $0 node openwrt_build $TYPE $RUN $TARGET $CONFIG $TMPDIR_B1
- # rsync back
- # copy logs and images
- rsync -a $GENERIC_NODE1:$TMPDIR_B1/$RUN/ $TMPDIR/$RUN/
-
ssh $GENERIC_NODE1 $0 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
- ## GENERIC_NODE2
+ ## second run
RUN=b2
TMPDIR_B2=$(ssh $HOST_A mktemp --tmpdir=/srv/workspace/chroots/ -d -t rbuild-lede-build-XXXXXXXX)
ssh $GENERIC_NODE2 $0 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
}