[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible_lede: save the different target into different files

Mon Jun 26 19:24:35 UTC 2017

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit c309768a5c4a0a94fdbd3842de9f454dcd32b69e
Author: Alexander Couzens <lynxis at fe80.eu>
Date:   Mon Jun 26 21:16:17 2017 +0200

    reproducible_lede: save the different target into different files
    
    At the moment the scripts saves all targets under the same name meaning they overwrite
    each other.
    Introduce lede_target to not parse the lede_config to find out which
    target is now build.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_lede.sh  | 13 +++++++------
 job-cfg/reproducible.yaml |  5 ++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/bin/reproducible_lede.sh b/bin/reproducible_lede.sh
index 5a58a3f..95a2ae0 100755
--- a/bin/reproducible_lede.sh
+++ b/bin/reproducible_lede.sh
@@ -8,7 +8,8 @@
 OPENWRT_GIT_REPO=https://git.lede-project.org/lede/lynxis/staging.git
 OPENWRT_GIT_BRANCH=master
 DEBUG=false
-CONFIG=
+LEDE_CONFIG=
+LEDE_TARGET=
 
 . /srv/jenkins/bin/common-functions.sh
 common_init "$@"
@@ -46,7 +47,8 @@ case $1 in
 	;;
 	master)
 		# master code following
-		CONFIG=$2
+		LEDE_TARGET=$2
+		LEDE_CONFIG=$3
 	;;
 	*)
 		echo "Unsupported mode $1. Arguments are $@"
@@ -69,8 +71,7 @@ cd $TMPBUILDDIR
 
 create_results_dirs lede
 
-# FIXME: remove first argument (TARGET). The TARGET is only used in log messages
-build_two_times lede "$CONFIG" "$CONFIG"
+build_two_times lede "$LEDE_TARGET" "$LEDE_CONFIG"
 
 # for now we only build one architecture until it's at most reproducible
 #build_two_times x86_64 "CONFIG_TARGET_x86=y\nCONFIG_TARGET_x86_64=y\n"
@@ -210,7 +211,7 @@ fi
 #  finally create the webpage
 #
 cd $TMPDIR ; mkdir lede
-PAGE=lede/lede.html
+PAGE=lede/lede_$LEDE_TARGET.html
 cat > $PAGE <<- EOF
 <!DOCTYPE html>
 <html lang="en-US">
@@ -249,7 +250,7 @@ rm -f $DBD_HTML $DBD_GOOD_PKGS_HTML $DBD_BAD_PKGS_HTML $TOOLCHAIN_HTML $BANNER_H
 # the end
 calculate_build_duration
 print_out_duration
-irc_message reproducible-builds "$REPRODUCIBLE_URL/lede/ has been updated. ($GOOD_PERCENT_IMAGES% images and $GOOD_PERCENT_PACKAGES% packages reproducible)"
+irc_message reproducible-builds "$REPRODUCIBLE_URL/$PAGE has been updated. ($GOOD_PERCENT_IMAGES% images and $GOOD_PERCENT_PACKAGES% packages reproducible)"
 echo "============================================================================="
 
 # remove everything, we don't need it anymore...
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 517080f..4f9f897 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -595,18 +595,21 @@
                 - 'lede-target-ar71xx':
                     my_timed: '42 21 * * 4'
                     my_lede_config: 'CONFIG_TARGET_ar71xx=y'
+                    my_lede_target: 'ar71xx'
                 - 'lede-target-ramips':
                     my_timed: '42 23 * * 4'
                     my_lede_config: 'CONFIG_TARGET_ramips=y'
+                    my_lede_target: 'ramips'
                 - 'lede-target-x86':
                     my_timed: '42 1 * * 5'
                     my_lede_config: 'CONFIG_TARGET_x86=y'
+                    my_lede_target: 'x86'
                 - 'openwrt':
                     my_description: 'Rebuild OpenWrt (some targets, some packages) twice (with variations) and investigate regarding reproducibility.'
                     my_timed: '42 23 * * 2'
                     my_shell: '/srv/jenkins/bin/reproducible_openwrt.sh master'
             my_description: 'Rebuild LEDE (one target, some packages) twice (with variations) and investigate regarding reproducibility.'
-            my_shell: '/srv/jenkins/bin/reproducible_lede.sh master {my_lede_config}'
+            my_shell: '/srv/jenkins/bin/reproducible_lede.sh master {my_lede_target} {my_lede_config}'
             my_trigger: ''
             my_hname: ''
             my_recipients: 'jenkins+reproducible-builds qa-jenkins-scm at lists.alioth.debian.org lynxis at fe80.eu'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git

