From 2fa82233ce6874de037eeeeb286ed1f8f86d8027 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Sat, 24 Jun 2017 18:47:59 +0200 Subject: reproducible LEDE: WIP: add multiple architectures Signed-off-by: Holger Levsen --- bin/reproducible_lede.sh | 6 +++++- job-cfg/reproducible.yaml | 9 +++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/bin/reproducible_lede.sh b/bin/reproducible_lede.sh index d85bb062..5a58a3fa 100755 --- a/bin/reproducible_lede.sh +++ b/bin/reproducible_lede.sh @@ -8,6 +8,8 @@ OPENWRT_GIT_REPO=https://git.lede-project.org/lede/lynxis/staging.git OPENWRT_GIT_BRANCH=master DEBUG=false +CONFIG= + . /srv/jenkins/bin/common-functions.sh common_init "$@" @@ -44,6 +46,7 @@ case $1 in ;; master) # master code following + CONFIG=$2 ;; *) echo "Unsupported mode $1. Arguments are $@" @@ -66,7 +69,8 @@ cd $TMPBUILDDIR create_results_dirs lede -build_two_times lede ar71xx_generic_ARCHERC7 "CONFIG_TARGET_ar71xx=y\nCONFIG_TARGET_ar71xx_generic=y\n" +# FIXME: remove first argument (TARGET). The TARGET is only used in log messages +build_two_times lede "$CONFIG" "$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" diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index b0e06e9d..34af4c8d 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -592,10 +592,15 @@ - '{name}_{otherproject_artifacts}': otherproject_artifacts: - - 'lede': + - 'lede-{lede_config}': my_description: 'Rebuild LEDE (some targets, some packages) twice (with variations) and investigate regarding reproducibility.' my_timed: '42 23 * * 4' - my_shell: '/srv/jenkins/bin/reproducible_lede.sh master' + my_shell: '/srv/jenkins/bin/reproducible_lede.sh master {lede_config}' + lede_config: + - CONFIG_TARGET_ar71xx=y + - CONFIG_TARGET_ramips=y + - CONFIG_TARGET_x86=y + - 'openwrt': my_description: 'Rebuild OpenWrt (some targets, some packages) twice (with variations) and investigate regarding reproducibility.' my_timed: '42 23 * * 2' -- cgit v1.2.3-70-g09d2