From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6759579508225867776 X-Received: by 2002:adf:db41:: with SMTP id f1mr15738127wrj.351.1573837247012; Fri, 15 Nov 2019 09:00:47 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:e8cc:: with SMTP id k12ls14740707wrn.9.gmail; Fri, 15 Nov 2019 09:00:46 -0800 (PST) X-Google-Smtp-Source: APXvYqy5PVtsaC4SHbbUsV6GBJ4foc6bkOULVxsQiZSqv/i3xvRiTzMmwamFXbrMR01erilEbK3L X-Received: by 2002:a5d:6351:: with SMTP id b17mr36344wrw.126.1573837246490; Fri, 15 Nov 2019 09:00:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573837246; cv=none; d=google.com; s=arc-20160816; b=KL2R6JXJe41wUzcZGYli9gnmADSFUQqOZ5db2m57NOMbkeHnseV5c9XDWEjg4Wy0GP BkiYevAI62IWbiSiT0dJCH66PFnCqWJeJyoXt6b5n/0j76o/6VVMpr63u7AqR+9WtDSR lLOroqELZzUIwh9j1OtN6w7dU17X0eowBFfS13jn13Z3N4P2CygJzUgPzb8vs/xx4ZtP OSxT+J76T/hKLYZyoH7fYRPRVBezgnt2IbG1A0T3MzCySlEmer+/+aKBjkaPgImmZtRz tzbi/gWUW33EdJw+t3ayoN2PvWUhU+l7iwRrJAkhNCxeM6BFTdVE+wSCAvlgETdNnLWq lVrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=QF14kGAaf+v5ZIRlgHIZzyMD6mz261P0AhOGMlB0hTI=; b=rC6nFTHRo2LdDRjrC1g25QQ45iLeKYZD/Y92vs30kDS5wfhAsYwX1d9qIJSpIONx/M 3BY19E+WPlYSy8gI8hw5ZlOeP/Ud+glR+3nkqWVBAd7SNkr5jnJQ41EIUSBxkps9coHi NkRaG1gkx9bWqw1nOgxF7ZpLC3Cge6kUQ6YhJ8pKzz+7k8MyQddoDpRPB7cevKmHgRRp mfdjCMgo6v1BSpS8CZu7pZOLUJhRSigPg3KyAA/XgFGtVc/8Y8D1nMZxvENvym4aUdIx 8x6WyiE5XsE2zQmDIaLAMesBDgwLmBJyxBLVLSw9WX3llEIcuI/CDqDix0c17G6wq3eS ENxw== 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 q25si167755wmj.2.2019.11.15.09.00.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Nov 2019 09:00:46 -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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id xAFH0kKj030257 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 15 Nov 2019 18:00:46 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.0.65]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id xAFH0jQq016955; Fri, 15 Nov 2019 18:00:45 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Henning Schild Subject: [PATCH 1/2] ci: always test signed and unsigned repo builds Date: Fri, 15 Nov 2019 18:00:43 +0100 Message-Id: <20191115170044.26683-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: Ml6TMaUGwMcw 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 -- 2.23.0