From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6937761446930415616 X-Received: by 2002:a05:6512:3046:: with SMTP id b6mr19721181lfb.407.1615323463167; Tue, 09 Mar 2021 12:57:43 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:6d4:: with SMTP id u20ls5111437lff.1.gmail; Tue, 09 Mar 2021 12:57:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJzchHLWZ49zTB9N7DYNZeaz0/VdjHTJGNfcbrEE6ExkGG8HauUhqnynbt6FuxyIBHlnb/ff X-Received: by 2002:a05:6512:36d8:: with SMTP id e24mr18097196lfs.188.1615323462164; Tue, 09 Mar 2021 12:57:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615323462; cv=none; d=google.com; s=arc-20160816; b=nS0JvDywNw3GtSK1QhqykzRYboob38trklPyr3QNUxqSn0RgENjMZq+Ogw4OqpVo28 zlqssZR0VHKDU1FZoJkT6oLX+M97siBp3b37f/lfi9FBZzT5jCGX7Po7pjf0IqEYtCNb JXtnaJvxEQFBM5UC9C4EXY/6REg14qyl877G8XU/qdz8d34KeM+u3LCmQCcGQjFl4YCb ZBXUkslY39yyXWWPcGhpFEozxjIZD0Niqr+rD5Zoea6MngFMqNOm9Rr3ydneKUIoDg/8 Mx9Zfgi1+gnfsRnAH4VRhLS/BHMJ87WFnccAXdccwXpeVyKhyLkAc9qASXbGBR9u2o5G q1Xg== 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:to:from; bh=7O/cFR1aAkqtTjWQ67srvVIO8A4Aul3T6FOMpEiUVrs=; b=PPp4KVqv91u5ohF2eY4cHXxjTuRjUeVpMDSoqLhGdL168ZtNy5LRa2vq/Hjm0nFQdB JZNKX6XkXSAlmT3T1iez5WsYIYSpniIrFO/Ce4YhShdE/r2JXDa2+SKrMIRrr7oJCLrQ J4YwXcNDI4fzo6X21QEfweTKag4G7bizqLslNNzTRKQ9wTcOP2Uso+oYXHAoTVsW3jQM mWAGFOHiIp8IY5QcxojLeYvGvonuo8CVRVGiz5kt9T8idICHy+fTIquWfFnFgTH+WfKt ZwRGpW9P2vGua59euZBurwmtsKQGlCzqiz2eOg64Bw7n/ykAQmBeOOmBJLRKQZ85gfa4 3V3g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=silvano.cirujano-cuesta@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 63si404813lfd.1.2021.03.09.12.57.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Mar 2021 12:57:41 -0800 (PST) Received-SPF: pass (google.com: domain of silvano.cirujano-cuesta@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 silvano.cirujano-cuesta@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=silvano.cirujano-cuesta@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 129KvfmU008771 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 9 Mar 2021 21:57:41 +0100 Received: from md1sf36c.ad001.siemens.net ([139.22.35.216]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 129Kqeb6031095 for ; Tue, 9 Mar 2021 21:52:40 +0100 From: Silvano Cirujano Cuesta To: isar-users@googlegroups.com Subject: [PATCH v6 5/5] ci: add container image testing configurations Date: Tue, 9 Mar 2021 21:52:39 +0100 Message-Id: <20210309205239.652677-6-silvano.cirujano-cuesta@siemens.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210309205239.652677-1-silvano.cirujano-cuesta@siemens.com> References: <20210309205239.652677-1-silvano.cirujano-cuesta@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: hH/Gr8Escbvl Signed-off-by: Silvano Cirujano Cuesta --- meta-isar/conf/machine/container.conf | 5 +++++ meta-isar/conf/multiconfig/container-bullseye.conf | 4 ++++ meta-isar/conf/multiconfig/container-buster.conf | 4 ++++ meta-isar/conf/multiconfig/container-focal.conf | 4 ++++ meta-isar/conf/multiconfig/container-stretch.conf | 4 ++++ scripts/ci_build.sh | 11 ++++++++++- 6 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 meta-isar/conf/machine/container.conf create mode 100644 meta-isar/conf/multiconfig/container-bullseye.conf create mode 100644 meta-isar/conf/multiconfig/container-buster.conf create mode 100644 meta-isar/conf/multiconfig/container-focal.conf create mode 100644 meta-isar/conf/multiconfig/container-stretch.conf diff --git a/meta-isar/conf/machine/container.conf b/meta-isar/conf/machine/container.conf new file mode 100644 index 0000000..367d790 --- /dev/null +++ b/meta-isar/conf/machine/container.conf @@ -0,0 +1,5 @@ +# This software is a part of ISAR. +# Copyright (C) 2015-2017 ilbers GmbH + +IMAGE_TYPE = "container-img" + diff --git a/meta-isar/conf/multiconfig/container-bullseye.conf b/meta-isar/conf/multiconfig/container-bullseye.conf new file mode 100644 index 0000000..200b241 --- /dev/null +++ b/meta-isar/conf/multiconfig/container-bullseye.conf @@ -0,0 +1,4 @@ +# This software is a part of ISAR. + +MACHINE ?= "container" +DISTRO ?= "debian-bullseye" diff --git a/meta-isar/conf/multiconfig/container-buster.conf b/meta-isar/conf/multiconfig/container-buster.conf new file mode 100644 index 0000000..78b0324 --- /dev/null +++ b/meta-isar/conf/multiconfig/container-buster.conf @@ -0,0 +1,4 @@ +# This software is a part of ISAR. + +MACHINE ?= "container" +DISTRO ?= "debian-buster" diff --git a/meta-isar/conf/multiconfig/container-focal.conf b/meta-isar/conf/multiconfig/container-focal.conf new file mode 100644 index 0000000..10e0071 --- /dev/null +++ b/meta-isar/conf/multiconfig/container-focal.conf @@ -0,0 +1,4 @@ +# This software is a part of ISAR. + +MACHINE ?= "container" +DISTRO ?= "ubuntu-focal" diff --git a/meta-isar/conf/multiconfig/container-stretch.conf b/meta-isar/conf/multiconfig/container-stretch.conf new file mode 100644 index 0000000..3ff8bcb --- /dev/null +++ b/meta-isar/conf/multiconfig/container-stretch.conf @@ -0,0 +1,4 @@ +# This software is a part of ISAR. + +MACHINE ?= "container" +DISTRO ?= "debian-stretch" diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 3868fb6..c3d49dd 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -33,7 +33,11 @@ TARGETS_SET="\ mc:qemumipsel-buster:isar-image-base \ mc:nand-ubi-demo-buster:isar-image-ubi \ mc:rpi-stretch:isar-image-base \ - mc:qemuamd64-focal:isar-image-base" + mc:qemuamd64-focal:isar-image-base \ + mc:container-stretch:isar-image-base \ + mc:container-buster:isar-image-base \ + mc:container-focal:isar-image-base \ + " # qemu-user-static of <= buster too old to build that # mc:qemuarm64-buster:isar-image-base # mc:qemuarm64-bullseye:isar-image-base @@ -43,6 +47,7 @@ TARGETS_SET_BULLSEYE="\ mc:qemuarm-bullseye:isar-image-base \ mc:qemui386-bullseye:isar-image-base \ mc:qemumipsel-bullseye:isar-image-base \ + mc:container-bullseye:isar-image-base \ " CROSS_TARGETS_SET="\ @@ -201,6 +206,10 @@ fi # In addition test SDK creation bitbake $BB_ARGS -c do_populate_sdk mc:qemuarm-stretch:isar-image-base while [ -e bitbake.sock ]; do sleep 1; done +# and SDK container image creation +SDK_FORMAT="docker-archive" BB_ENV_WHITELIST="$BB_ENV_WHITELIST SDK_FORMAT" \ + bitbake $BB_ARGS -c do_populate_sdk mc:qemuarm-stretch:isar-image-base +while [ -e bitbake.sock ]; do sleep 1; done if [ -z "$FAST_BUILD" ]; then # Cleanup and disable cross build -- 2.30.1