From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6759579508225867776 X-Received: by 2002:adf:fd91:: with SMTP id d17mr16109701wrr.214.1573837709266; Fri, 15 Nov 2019 09:08:29 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:f417:: with SMTP id z23ls16243017wma.5.canary-gmail; Fri, 15 Nov 2019 09:08:28 -0800 (PST) X-Google-Smtp-Source: APXvYqxvLCVGRcInVdSV7m0HolPn5qYPQq3Uv8WnWUXK2B6ZQcYEaVJqe2KsirJmlLdAY1fCTkGp X-Received: by 2002:a1c:f612:: with SMTP id w18mr16824723wmc.28.1573837708616; Fri, 15 Nov 2019 09:08:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573837708; cv=none; d=google.com; s=arc-20160816; b=FaRH8RRW2g46rp7GCbGkmCHtTMjQjI4l5rB3h0JB238tdRKTTvDrFX6pbsxKY/dE2l ThJFlovvGe7JyHS5BPMr2Juljku9jCiKIIMAD9Uz+0H682Iy5lVvrKd3kVazoHKcrbBe yZNCQx6sFR1NgdGp3a2ZTVigRLxlQ9YElPM/9ksZHCwcnSarELBf3f1CnhjLU+AUQygU hHRFFLHhp1Ltz7Q/VJiuaw2sDnEc1/mrh6PGH194PYUXVmKDOxFMvaFVTTP1DIhXSKEA U4gaUH9yIrXyqSGBHcOBcxNk/E4BzhUwSp6XMUepTlGy/F7X3F1l/PtzX54TLBla1kyI LdIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=lIbb/z7fpAdQQ9gpGSS4RKq2RxuO8jCCJewRSkTfpRQ=; b=S12tHb7ciUpDoKBLbZpU0miZ4OwUCCcj0y0qrdg4twt8N8bAHQEjKhqIBiNyRk880e 4cT5OAGOvjsYtH2ahI0JVQkRufQh0PsuO0OU/uRrcJ3ssfhqGXx8zql4ziNZjxQMdd6d Q3oY09w66w8JIVHIkwVQPPGxVtYcGuZaZs2bPgyXa5A0cUq0Wx96vFOkbKdRSnVTG01f iejfC4bMWvod0CgHJX/X3M5lG9Z9eqmezjfXb0tiSrj3xScF/chlKRkvPnN+us/qZm1M DQCcJHfyjQGZpUkCA1CNoOzYbZOg8ulJ9wawJnU9oo6YByth3OJY4nS2XgpilQP9wOjH EaLQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id q128si589229wme.1.2019.11.15.09.08.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Nov 2019 09:08:28 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id xAFH8Svt028587 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 15 Nov 2019 18:08:28 +0100 Received: from [139.22.40.153] ([139.22.40.153]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id xAFH8RLL025653; Fri, 15 Nov 2019 18:08:27 +0100 Subject: Re: [PATCH 1/2] ci: always test signed and unsigned repo builds To: Henning Schild , isar-users@googlegroups.com References: <20191115170044.26683-1-henning.schild@siemens.com> <20191115180604.6ea2bdcd@md1za8fc.ad001.siemens.net> From: Jan Kiszka Message-ID: Date: Fri, 15 Nov 2019 18:08:27 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.1 MIME-Version: 1.0 In-Reply-To: <20191115180604.6ea2bdcd@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: RCD4tysiXp3v On 15.11.19 18:06, Henning Schild wrote: > This is not the full test-it all i imagined. But in order to send the > fix ASAP and bring at least some testing, that is what i came up with. > > Note if your CI uses "-r -s" you will have to change it! Or this patch > needs a legacy option ignore for the "-s". Then please also update in-tree .gitlab-ci.yml accordingly. This would otherwise break the night CI. Jan > > Whatever we come up with for this one, the second one is a fix that > probably solves Jans issue. It could potentially be applied before the > testing gets "repaired", but i would like both to be applied. Would > mean we test signed+unsigned but not yet the extra key sources > (DISTRO_BOOTSTRAP_KEYS THIRD_PARTY_APT_KEYS) > > Henning > > On Fri, 15 Nov 2019 18:00:43 +0100 > Henning Schild wrote: > >> 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 >> --- >> scripts/ci_build.sh | 38 +++++++++++++++++++++++--------------- >> 1 file changed, 23 insertions(+), 15 deletions(-) >> >> diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh >> index ecaa88a..8295c43 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,6 @@ do >> ;; >> -r|--repro) >> REPRO_BUILD="1" >> - case "$2" in >> - -s|--sign) SIGN_REPO='1'; shift ;; >> - esac >> ;; >> *) >> echo "error: invalid parameter '$key', please try '--help' >> to get list of supported parameters" @@ -133,13 +131,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 +159,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 > -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux