From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6759579508225867776 X-Received: by 2002:ac2:43a6:: with SMTP id t6mr1541327lfl.115.1573838500969; Fri, 15 Nov 2019 09:21:40 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4465:: with SMTP id y5ls1776643lfl.16.gmail; Fri, 15 Nov 2019 09:21:40 -0800 (PST) X-Google-Smtp-Source: APXvYqxQLMwdLb+YYeoYJUxDee4bJQH+vS+MwHPcpnTGq1mdiAAJvL7m+7lHg6g20+iHgLE6KYvd X-Received: by 2002:a05:6512:511:: with SMTP id o17mr1574423lfb.167.1573838500544; Fri, 15 Nov 2019 09:21:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573838500; cv=none; d=google.com; s=arc-20160816; b=MRTGJR7Szphbja0y7075p0LQCOVQShNNDs1rgqbF9WaUmVIUQwl3GYv227nSeDd5hY AMz8uOUu5YPu6crDrid/bHNi75KaPhSRSzBuQ2njudsZfc29TxA+Ct1Xsz0xGQwqWcPh ssvpewZ3xErqIKIZ7gCorNKS16/z1n5Ckdb670O+S6ukouAY/VA+8+uQyyYRYvJvcen0 VaM75MqaQI6eh8YXXl0s+pm3BcvZswjxajDEjD+FKsBON4/S1heRqwNQprBikHemXL3T ei2cy2aabP4RL8Y+lbIngXraZCMVeMWIr7ImEOuct8qYY1W+UlmlFOM1wL8YkV7HvOmO /bMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=VjW97c3uYkrM2wjEAcWWmTCUN7iUX4Jo6j2Rs3yxO8I=; b=Fv7jRNgIRmYMlD0tyId3syOrxASkOTid3vyAmh4GyLcAdZLRoBbEVLbIO1hX13Wbhn dtFAB0vQo6qwq5yNiobeQhO4bh1RNZkHEdRC0UTTnLlct+SzzyCZH7rOFndbWMK90uTE 2+h0yG5fo/i+0HBaoSjTSZoNKJi78Eru0jELDDtMYPgXoAzVlb7M93BFPaIy0lvmYsq4 zgXy545xJaheMEeD+lPSa78DjuRuEVOYr1KHoNqAfszoim1XPTF12j4gjY0fkL/eXS61 XC/pYAj6Wv2sKMF4MrSwF/uqfPV6K/HfjVfGGGyi9MQ3S7hu7BFPH5cz3MFRApn9bItU +VYA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id b13si444062ljk.4.2019.11.15.09.21.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Nov 2019 09:21:40 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id xAFHLdA2010112 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 15 Nov 2019 18:21:39 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.0.65]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id xAFHLdrf006924; Fri, 15 Nov 2019 18:21:39 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Henning Schild Subject: [PATCHv2 1/2] ci: always test signed and unsigned repo builds Date: Fri, 15 Nov 2019 18:21:38 +0100 Message-Id: <20191115172138.27373-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191115170044.26683-1-henning.schild@siemens.com> References: <20191115170044.26683-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: pHn7D3mXVJhY From: Henning Schild Just split the target set we had into two. Test the first signed and the other one unsigned. Signed-off-by: Henning Schild --- .gitlab-ci.yml | 2 +- scripts/ci_build.sh | 42 +++++++++++++++++++++++++++--------------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd6e12b..1437bd7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ full-ci: - PREVIOUS_SHA="$(cat .CI_COMMIT_SHA || true)" - if [ "$CI_COMMIT_SHA" != "$PREVIOUS_SHA" ]; then echo "$CI_COMMIT_SHA" > .CI_COMMIT_SHA; - scripts/ci_build.sh -q -c -r -s; + scripts/ci_build.sh -q -c -r; fi cache: key: "$CI_COMMIT_REF_SLUG" diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index ecaa88a..8707a71 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -50,13 +50,14 @@ CROSS_TARGETS_SET="\ mc:de0-nano-soc-stretch:isar-image-base \ mc:rpi-stretch:isar-image-base" -REPRO_TARGETS_SET="\ +REPRO_TARGETS_SET_SIGNED="\ mc:qemuarm-stretch:isar-image-base \ - mc:qemuarm64-stretch:isar-image-base \ + mc:qemuarm64-stretch:isar-image-base" + +REPRO_TARGETS_SET="\ mc:qemuamd64-stretch:isar-image-base \ mc:qemuarm-buster:isar-image-base" - show_help() { echo "This script builds the default Isar images." echo @@ -70,7 +71,7 @@ show_help() { echo " -d, --debug enable debug bitbake output." echo " -f, --fast cross build reduced set of configurations." echo " -q, --quiet suppress verbose bitbake output." - echo " -r, --repro [-s, --sign] enable use of cached base repository with optional signing." + echo " -r, --repro enable use of cached base repository." echo " --help display this message and exit." echo echo "Exit status:" @@ -109,9 +110,10 @@ do ;; -r|--repro) REPRO_BUILD="1" - case "$2" in - -s|--sign) SIGN_REPO='1'; shift ;; - esac + # this switch is deprecated, just here to not cause failing CI on legacy configs + case "$2" in + -s|--sign) shift ;; + esac ;; *) echo "error: invalid parameter '$key', please try '--help' to get list of supported parameters" @@ -133,13 +135,24 @@ if [ -n "$CROSS_BUILD" ]; then fi if [ -n "$REPRO_BUILD" ]; then - if [ -n "$SIGN_REPO" ]; then - ISAR_TESTSUITE_GPG_PUB_KEY_FILE="$ISARROOT/testsuite/base-apt/test_pub.key" - ISAR_TESTSUITE_GPG_PRIV_KEY_FILE="$ISARROOT/testsuite/base-apt/test_priv.key" - export GNUPGHOME=$(mktemp -d) - gpg --import $ISAR_TESTSUITE_GPG_PUB_KEY_FILE $ISAR_TESTSUITE_GPG_PRIV_KEY_FILE - echo BASE_REPO_KEY=\"file://$ISAR_TESTSUITE_GPG_PUB_KEY_FILE\" >> conf/local.conf - fi + ISAR_TESTSUITE_GPG_PUB_KEY_FILE="$ISARROOT/testsuite/base-apt/test_pub.key" + ISAR_TESTSUITE_GPG_PRIV_KEY_FILE="$ISARROOT/testsuite/base-apt/test_priv.key" + export GNUPGHOME=$(mktemp -d) + gpg --import $ISAR_TESTSUITE_GPG_PUB_KEY_FILE $ISAR_TESTSUITE_GPG_PRIV_KEY_FILE + + # Enable use of cached base repository + echo BASE_REPO_KEY=\"file://$ISAR_TESTSUITE_GPG_PUB_KEY_FILE\" >> conf/local.conf + bitbake $BB_ARGS -c cache_base_repo $REPRO_TARGETS_SET_SIGNED + while [ -e bitbake.sock ]; do sleep 1; done + sudo rm -rf tmp + sed -i -e 's/#ISAR_USE_CACHED_BASE_REPO ?= "1"/ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf + bitbake $BB_ARGS $REPRO_TARGETS_SET_SIGNED + while [ -e bitbake.sock ]; do sleep 1; done + # Cleanup and disable use of cached base repository + sudo rm -rf tmp + sed -i -e 's/ISAR_USE_CACHED_BASE_REPO ?= "1"/#ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf + sed -i -e 's/^BASE_REPO_KEY/#BASE_REPO_KEY/g' conf/local.conf + # Enable use of cached base repository bitbake $BB_ARGS -c cache_base_repo $REPRO_TARGETS_SET while [ -e bitbake.sock ]; do sleep 1; done @@ -150,7 +163,6 @@ if [ -n "$REPRO_BUILD" ]; then # Cleanup and disable use of cached base repository sudo rm -rf tmp sed -i -e 's/ISAR_USE_CACHED_BASE_REPO ?= "1"/#ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf - sed -i -e 's/^BASE_REPO_KEY/#BASE_REPO_KEY/g' conf/local.conf fi sed -i -e 's/#IMAGE_INSTALL += "isar-disable-apt-cache"/IMAGE_INSTALL += "isar-disable-apt-cache"/g' conf/local.conf -- 2.23.0