From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6759579508225867776 X-Received: by 2002:a2e:9dd5:: with SMTP id x21mr2702759ljj.232.1573838574003; Fri, 15 Nov 2019 09:22:54 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:961a:: with SMTP id v26ls2314685ljh.5.gmail; Fri, 15 Nov 2019 09:22:53 -0800 (PST) X-Google-Smtp-Source: APXvYqyPm83ji8RqVNQlKJWxtU3j+IgiBqjkk5way1VEOdGcJSgM84F0/t157Q845NmMQp9S2LQZ X-Received: by 2002:a2e:9cc8:: with SMTP id g8mr12079060ljj.91.1573838573333; Fri, 15 Nov 2019 09:22:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573838573; cv=none; d=google.com; s=arc-20160816; b=ZSTCjNsJqiQPRvHitlUzSyrEfVBl+Tse+TrPTXfaPnRgUsoi5Z5oAMpMwDuV4hH0Vy QwOdrTNNZSROUVzm7J1LfcpqPuE7ZqWy/M8OYw1/ywzlKKVAqF6E4b0bvD9B2HsqTqA4 fy3NCQ2ttDhFMMLyyjc8WjH16JA+tCrLn09ve1LX/4gRrZXAYEHnb2sdQHKoxfdowV/x Lqe0bK9qpVhyxFTTdEiEVHuUJWK3UiG73PFZZZ0vmfWhyrW9lpVIBxq7ErBHcViPkIiJ qHMNdI2aCv2FhLDRrDzH7+OiwkzqNFq++KMS7t+DcSUtwo1JsTjTX23PiG48HY9t92dN 9ovQ== 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=0Ef/Dc/XqlYig8e322FdpXMuPeshTHPkHY57v4D69rI=; b=0F39REUXaVLiCo/Gy1Er5Ol9kaW4K4rxv2TnRSYUBSrjwsFMGguOzFnAhMm8UJLuoD 43+DDl4J06UIcukZNDDFLnMZCHgRdp2cB+ssA+np/2rlqMDwvBmeEb3F3uIYlV81rpRy kxl9PEYbfNzMv0oj2/g162IVx6PLYNV+OF+t0FV+ol9HGnF/XlDL/VmqVKlNsMX0W8ow BnoB9Q8B2hEzO8S//f6kvwTOCuQ+a3zYzRGe3B1akHZYsGhmda5yxdFnZ4mSTBGx2Hoy RCMSfnDYom+Cq6jw0tOoLXHCwi6PXm5PgNH80IOrsbi4B4RD9Ff9ai3R7P9IeMXb0jw9 2kKw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id z18si544458lfh.1.2019.11.15.09.22.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Nov 2019 09:22:53 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id xAFHMqbU006022 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 15 Nov 2019 18:22:52 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.0.65]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id xAFHMqpC009777; Fri, 15 Nov 2019 18:22:52 +0100 Date: Fri, 15 Nov 2019 18:22:51 +0100 From: Henning Schild To: Cc: Jan Kiszka Subject: Re: [PATCHv2 1/2] ci: always test signed and unsigned repo builds Message-ID: <20191115182251.4b0db532@md1za8fc.ad001.siemens.net> In-Reply-To: <20191115172138.27373-1-henning.schild@siemens.com> References: <20191115170044.26683-1-henning.schild@siemens.com> <20191115172138.27373-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: lSTXklNkJT+V diff to v1: - just ignore the "-s" for "legacy" CI - update gitlab-ci config Henning On Fri, 15 Nov 2019 18:21:38 +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 > --- > .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