From 31df403c8b33cc54a16d07f1930a7079ccaba3a2 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Sun, 18 Jun 2017 23:40:05 +0200 Subject: reproducible_{openwrt,lede}: move toolchain.html creation to remote node There is no sense in creating the toolchain part on the jenkins master. Signed-off-by: Holger Levsen --- bin/reproducible_lede.sh | 26 +++----------------------- bin/reproducible_lede_common.sh | 32 ++++++++++++++++++++++++++++++++ bin/reproducible_openwrt.sh | 26 +++----------------------- 3 files changed, 38 insertions(+), 46 deletions(-) (limited to 'bin') diff --git a/bin/reproducible_lede.sh b/bin/reproducible_lede.sh index 845e91c5..701bf25d 100755 --- a/bin/reproducible_lede.sh +++ b/bin/reproducible_lede.sh @@ -76,29 +76,9 @@ build_two_times lede ar71xx_generic_ARCHERC7 "CONFIG_TARGET_ar71xx=y\nCONFIG_TAR echo "=============================================================================" echo "$(date -u) - Creating Documentation HTML" echo "=============================================================================" -TOOLCHAIN_HTML=$(mktemp --tmpdir=$TMPDIR) -echo "" > $TOOLCHAIN_HTML -for i in $(ls -1d staging_dir/toolchain*|cut -d "-" -f2-|xargs echo) ; do - echo " " >> $TOOLCHAIN_HTML -done -echo "
Target toolchains built
$i
" >> $TOOLCHAIN_HTML -echo "" >> $TOOLCHAIN_HTML -for i in $(ls -1 build_dir/host/) ; do - echo " " >> $TOOLCHAIN_HTML -done -echo "
Contents of build_dir/host/
$i
" >> $TOOLCHAIN_HTML -echo "" >> $TOOLCHAIN_HTML -for i in $(ls -1 dl/) ; do - echo " " >> $TOOLCHAIN_HTML -done -echo "
Downloaded software
$i
" >> $TOOLCHAIN_HTML -echo "" >> $TOOLCHAIN_HTML -for i in gcc binutils bzip2 flex python perl make findutils grep diffutils unzip gawk util-linux zlib1g-dev libc6-dev git subversion ; do - echo " " >> $TOOLCHAIN_HTML -done -echo "
Debian $(cat /etc/debian_version) package on $(dpkg --print-architecture)installed version
$i" >> $TOOLCHAIN_HTML - dpkg -s $i|grep '^Version'|cut -d " " -f2 >> $TOOLCHAIN_HTML - echo "
" >> $TOOLCHAIN_HTML + +# created & copied by build_two_times() +TOOLCHAIN_HTML=$TMPDIR/toolchain.html # clean up builddir to save space on tmpfs rm -rf $TMPBUILDDIR/lede diff --git a/bin/reproducible_lede_common.sh b/bin/reproducible_lede_common.sh index 3dfc7d31..37dda724 100644 --- a/bin/reproducible_lede_common.sh +++ b/bin/reproducible_lede_common.sh @@ -74,6 +74,35 @@ create_results_dirs() { mkdir -p $BASE/$project/dbd } +node_document_environment() { + local tmpdir=$1 + local toolchain_html=$tmpdir/toolchain.html + + cd $tmpdir/build + echo "" > $toolchain_html + for i in $(ls -1d staging_dir/toolchain*|cut -d "-" -f2-|xargs echo) ; do + echo " " >> $toolchain_html + done + echo "
Target toolchains built
$i
" >> $toolchain_html + echo "" >> $toolchain_html + for i in $(ls -1 build_dir/host/) ; do + echo " " >> $toolchain_html + done + echo "
Contents of build_dir/host/
$i
" >> $toolchain_html + echo "" >> $toolchain_html + for i in $(ls -1 dl/) ; do + echo " " >> $toolchain_html + done + echo "
Downloaded software
$i
" >> $toolchain_html + echo "" >> $toolchain_html + for i in gcc binutils bzip2 flex python perl make findutils grep diffutils unzip gawk util-linux zlib1g-dev libc6-dev git subversion ; do + echo " " >> $toolchain_html + done + echo "
Debian $(cat /etc/debian_version) package on $(dpkg --print-architecture)installed version
$i" >> $toolchain_html + dpkg -s $i|grep '^Version'|cut -d " " -f2 >> $toolchain_html + echo "
" >> $toolchain_html +} + # node_save_logs can be called over ssh OR called within openwrt_build node_save_logs() { local tmpdir=$1 @@ -89,6 +118,8 @@ node_save_logs() { else tar cJf "$tmpdir/build_logs.tar.xz" -C "$tmpdir/build/source" ./logs fi + + node_document_environment $tmpdir } # RUN - is b1 or b2. b1 for first run, b2 for second @@ -388,6 +419,7 @@ build_two_times() { # rsync back logs and images rsync -av $GENERIC_NODE1:$TMPDIR/$RUN/ $TMPDIR/$RUN/ rsync -av $GENERIC_NODE1:$TMPDIR/build_logs.tar.xz $WORKSPACE/results/build_logs_b1.tar.xz + rsync -av $GENERIC_NODE1:$TMPDIR/toolchain.html $TMPDIR/toolchain.html ssh $GENERIC_NODE1 reproducible_$TYPE node node_cleanup_tmpdirs $TMPDIR ## second run diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh index e4bc9cc9..0f894764 100755 --- a/bin/reproducible_openwrt.sh +++ b/bin/reproducible_openwrt.sh @@ -77,29 +77,9 @@ build_two_times openwrt ar71xx_generic_ARCHERC7 "CONFIG_TARGET_ar71xx_generic=y\ echo "=============================================================================" echo "$(date -u) - Creating Documentation HTML" echo "=============================================================================" -TOOLCHAIN_HTML=$(mktemp --tmpdir=$TMPDIR) -echo "" > $TOOLCHAIN_HTML -for i in $(ls -1d staging_dir/toolchain*|cut -d "-" -f2-|xargs echo) ; do - echo " " >> $TOOLCHAIN_HTML -done -echo "
Target toolchains built
$i
" >> $TOOLCHAIN_HTML -echo "" >> $TOOLCHAIN_HTML -for i in $(ls -1 build_dir/host/) ; do - echo " " >> $TOOLCHAIN_HTML -done -echo "
Contents of build_dir/host/
$i
" >> $TOOLCHAIN_HTML -echo "" >> $TOOLCHAIN_HTML -for i in $(ls -1 dl/) ; do - echo " " >> $TOOLCHAIN_HTML -done -echo "
Downloaded software
$i
" >> $TOOLCHAIN_HTML -echo "" >> $TOOLCHAIN_HTML -for i in gcc binutils bzip2 flex python perl make findutils grep diffutils unzip gawk util-linux zlib1g-dev libc6-dev git subversion ; do - echo " " >> $TOOLCHAIN_HTML -done -echo "
Debian $(cat /etc/debian_version) package on $(dpkg --print-architecture)installed version
$i" >> $TOOLCHAIN_HTML - dpkg -s $i|grep '^Version'|cut -d " " -f2 >> $TOOLCHAIN_HTML - echo "
" >> $TOOLCHAIN_HTML + +# created & copied by build_two_times() +TOOLCHAIN_HTML=$TMPDIR/toolchain.html # clean up builddir to save space on tmpfs rm -rf $TMPBUILDDIR/openwrt -- cgit v1.2.3-54-g00ecf