From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6927266035414335488 X-Received: by 2002:a2e:9183:: with SMTP id f3mr3401922ljg.109.1615579428329; Fri, 12 Mar 2021 12:03:48 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:3c10:: with SMTP id j16ls2193992lja.2.gmail; Fri, 12 Mar 2021 12:03:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJyr/xgftgv70uvVEQRJaElMACeQ4r6Yl9dc8rOAFIw3+DylEGnmV8LzPUsH1fZ+e8j/jEdO X-Received: by 2002:a2e:3818:: with SMTP id f24mr3469772lja.466.1615579427376; Fri, 12 Mar 2021 12:03:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615579427; cv=none; d=google.com; s=arc-20160816; b=0FPWoqu72DzhRSPY4+eZMPKE3+2I9UKWzN2SluMJI6Ufoz9/eth5nuCkWaOnnKQDL9 aKXjh2IAA+/YUeuWlU9tPNePhZEZMhl0kXFqRZamfJxJxtBjN+eGkKFH0yby0p6gGtoE SqYPpym20XqWribKvCHVccMXjLb8/ezzqrRblZiWm4gQJw5vjH5ZWk4+Xgy+27IWvtYL 6JDsnsoYFxcJrtmrzijRvFeSRHPptUhgO7uQZ/nhKR1OKqxsmtI7IcMGtRTVnsrn+yjR H0tyk9UZXuzlNxC1ABXfG9U0BXbQ7Yl9t+B+CcQJHXKLLXCxuC/BMZa4JPt6ghlqtugv Zxyg== 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=bwd5SkJ/JFSlvz6OwGn/bh80sWbNmD6yYkMrQutwxAg=; b=Y8XUcJ8lLBowzTI92980poBAY2mD5fOXESP6sPTB3wUpCH5uDiaAqWqwevzuiBjIxw +Iveg0CG8mh648Z/hBOMadrXB3dpVhiIoITyYIF89k1g4lYL8pW/oC6X7V5g85lpJWNH Pcm9ABL1EOVqWogEoQ74VfpQMg85lKbKC63mypWnIEvGymCEYVAaFMukKKd2Rf4wqf5G YvXu37jvQS3EGTFQgdqbD9rrehhR2dRyG//KWItfBT7RdLF8+up5xZSB7bOb2ZU+qxav LCjKXeaxg34sJAwjiI138uLecFTb15fEnA9mXimGx01WBmrCb7Iu+XdVOU6VZtCnInqi RgHg== 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 q3si310550lji.2.2021.03.12.12.03.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Mar 2021 12:03:47 -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 12CK3k8b020142 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 12 Mar 2021 21:03:46 +0100 Received: from md1sf36c.ad001.siemens.net ([167.87.3.106]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 12CJwiaR008930 for ; Fri, 12 Mar 2021 20:58:46 +0100 From: Silvano Cirujano Cuesta To: isar-users@googlegroups.com Subject: [PATCH v7 5/5] ci: add container image sample configurations Date: Fri, 12 Mar 2021 20:58:43 +0100 Message-Id: <20210312195843.96000-6-silvano.cirujano-cuesta@siemens.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210312195843.96000-1-silvano.cirujano-cuesta@siemens.com> References: <20210312195843.96000-1-silvano.cirujano-cuesta@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: ZFmscZjxEhxV Add samples for the creation of container images and containerized SDKs as well as testing configurations to the CI script. Signed-off-by: Silvano Cirujano Cuesta --- meta-isar/conf/local.conf.sample | 3 ++ meta-isar/conf/machine/container.conf | 5 ++++ .../conf/multiconfig/container-bullseye.conf | 4 +++ .../conf/multiconfig/container-buster.conf | 4 +++ .../conf/multiconfig/container-stretch.conf | 4 +++ scripts/ci_build.sh | 29 ++++++++++++++++++- 6 files changed, 48 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-stretch.conf diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 107496c..87ba26f 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -51,6 +51,9 @@ BBMULTICONFIG = " \ qemuamd64-buster \ qemuamd64-buster-tgz \ qemuamd64-bullseye \ + container-stretch \ + container-buster \ + container-bullseye \ qemumipsel-stretch \ qemumipsel-buster \ qemumipsel-bullseye \ 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-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..a8d861d 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -17,6 +17,15 @@ cd "$(dirname "$0")/.." # Start build in Isar tree by default BUILD_DIR=./build +# Check dependencies +DEPENDENCIES="umoci skopeo" +for prog in ${DEPENDENCIES} ; do + if [ ! -x "$(which $prog)" ] ; then + echo "missing $prog in PATH, exiting" >&2 + exit 1 + fi +done + BB_ARGS="-v" TARGETS_SET="\ @@ -33,7 +42,8 @@ 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 \ + " # qemu-user-static of <= buster too old to build that # mc:qemuarm64-buster:isar-image-base # mc:qemuarm64-bullseye:isar-image-base @@ -45,6 +55,12 @@ TARGETS_SET_BULLSEYE="\ mc:qemumipsel-bullseye:isar-image-base \ " +TARGETS_CONTAINERS="\ + mc:container-stretch:isar-image-base \ + mc:container-buster:isar-image-base \ + mc:container-bullseye:isar-image-base \ +" + CROSS_TARGETS_SET="\ mc:qemuarm-stretch:isar-image-base \ mc:qemuarm-buster:isar-image-base \ @@ -237,3 +253,14 @@ bitbake $BB_ARGS mc:qemuamd64-stretch:isar-image-base mv "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks.ci-backup" "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks" mv ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img.ci-backup \ ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img + +# Finalize with containerized images, since they remove some not-needed packages from the local.conf +sed -i -e 's/\(IMAGE_INSTALL = .*\) example-module-${KERNEL_NAME}\(.*\)/\1\2/g' conf/local.conf +sed -i -e 's/\(IMAGE_INSTALL = .*\) enable-fsck\(.*\)/\1\2/g' conf/local.conf +bitbake $BB_ARGS $TARGETS_CONTAINERS +while [ -e bitbake.sock ]; do sleep 1; done +# and SDK container image creation +SDK_FORMAT="docker-archive" BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE SDK_FORMAT" \ + bitbake $BB_ARGS -c do_populate_sdk mc:container-stretch:isar-image-base +while [ -e bitbake.sock ]; do sleep 1; done + -- 2.30.1