From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6759579508225867776 X-Received: by 2002:adf:a3d5:: with SMTP id m21mr3113283wrb.386.1573837566159; Fri, 15 Nov 2019 09:06:06 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:8183:: with SMTP id 3ls743323wra.12.gmail; Fri, 15 Nov 2019 09:06:05 -0800 (PST) X-Google-Smtp-Source: APXvYqwS69GiyNUwzKnIzfNlOinwDF9qPxtAYfSswHF8OLRcsKbTtYMoAIHIGC0PDCppNi01ulLY X-Received: by 2002:adf:e944:: with SMTP id m4mr6782249wrn.49.1573837565550; Fri, 15 Nov 2019 09:06:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573837565; cv=none; d=google.com; s=arc-20160816; b=ZvvZ1IZi59GrE/5PldsXpbgSlguNB2IkNoso5GPbgG++EEPKCbjYrp8IvRtWTj7i73 M+bvxwWFTsYVAPAjL17VVZPh3ZRp+XkJXTUn8GuNpX9k5+fgCEI9EFuRywSSEk5GUCbo TPCULoOKo4HjOU3IJoqXRiZDRgPD1gltP1eOxXh5tWViGkMbUEbnwbKjn2Bqfh/lr2Xi 4KjwPrsBj68vQAhM0lix7XuSeoy26O0PCROf/ulOa1grQ+aPxc8+/4jbSIkPvpE11lzd nNys9gofD4VNzqLOWUcVw/RfqH4W5OKBg1T3G3hTidmy/nOoajRin8k9+Yl3i+8RfcTq RiKQ== 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:subject:cc:to:from:date; bh=134RC8GbLQhDp55rWL+yUpjWJbGOP+6rTmUOOyO51Fo=; b=AZUdgn+/eIrpNoJBqXZpghVPLq+Lg/d2Zt3w+juG4V5+wmkwb46i0bwSIAR+i5QChz d5NIh1EK4XXH51mqNEj+WbCGezYZDoJ/0VGvTY8jB419wFRRNZ8TUhGX2Lnpkn2qNjKR ocuYPSqahD0ubbwCofrCc94jU2P02yl8GGLeimV7eAsT+JAHRu8Al0ITPMSorD/1dYa/ 1Y0hP5R90+AzW0U0j6tLO6kUZjGJn20FD3W8Q/cP/W23BbJmxgfooCTOxyWq2pJsnC27 bHVwiTO2b4vgWP96h6hyJ3MFwwR7VC1Nk5q2HDTAauzsqJ/95wx4TWhDKecQdJHLCmxD ehnw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id r11si668343wrl.3.2019.11.15.09.06.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Nov 2019 09:06:05 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id xAFH65LD006310 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 15 Nov 2019 18:06:05 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.0.65]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id xAFH65gR022808; Fri, 15 Nov 2019 18:06:05 +0100 Date: Fri, 15 Nov 2019 18:06:04 +0100 From: Henning Schild To: Cc: Jan Kiszka Subject: Re: [PATCH 1/2] ci: always test signed and unsigned repo builds Message-ID: <20191115180604.6ea2bdcd@md1za8fc.ad001.siemens.net> In-Reply-To: <20191115170044.26683-1-henning.schild@siemens.com> References: <20191115170044.26683-1-henning.schild@siemens.com> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: p465O+A+dL7H 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". 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