From patchwork Fri Mar 12 09:58:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Silvano Cirujano Cuesta X-Patchwork-Id: 358 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:c583:0:0:0:0:0 with SMTP id x3csp1558797oop; Fri, 12 Mar 2021 12:03:48 -0800 (PST) X-Received: by 2002:a2e:8706:: with SMTP id m6mr3304002lji.331.1615579428636; Fri, 12 Mar 2021 12:03:48 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1615579428; cv=pass; d=google.com; s=arc-20160816; b=iYWE/1Hy7shg4ZZhsWs0fxPW4rs/jq1YtGmaBvoR3gKIjK6j0Spu9JENKLxe5G9fvS GULZEzLYBtZqfYhsHuZq4TFbRWXPa3D63zu8MXlbmjX7l8fAREo6Ky5lWcVV/0UiM5m9 lWfEv+ve55wyUqWOxkF6TX2ye4t1+1yO3dRcUVfZjHmkvjbC6jRxHdunERkn6GRsvMiA Vqh5ydkujNYusqcpSc0xP5nvmtFQE5bvYAJowQZBqz7SgL+zFvP3BEOjcNoXTMXkbqdn meCci8md4REL4SPbxHabniavjO6CXqHnhQQRqY5CHEN0vAf2n8TV0/vShV8GueJ3KtyH DQjw== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=sopnZWehGnOpXJs2YM/GsM1y9d410xpQI6yrtvb2wGk=; b=smUrUYONQDWbqkZjqiqHupLLDwXFlJEOuh4s9TJwamBX6SDTE4iudr3ceFZ20nACTq qybKpJiDTx+gR/nDstjMYXDHRLB5vtuVB7yzPVSGT8ooNbA9/KQV0i6Tc/s7ktL0rAyz 7lg57NUJ4oZzUdCaa6ZI5MJWIwuxgxMne1Izo56k4+Aa7UDGIfUkucH2nS0h+mkV60F2 FiL8SZyYkS6JqoB84OQ46c7OXs0w/l2WF/KZcPJWx+l5AUDHpHWlG23NbmBwzCoF7hb8 aDSrGC23DRvbz8Q1l644FIzJl9HK7khILzc1mBpZmEfIUrHoqwymyi5rDGNmIo5fjRah K44g== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=bYNEJmfX; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbjesv6bamgqeqm5ht3i@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCD6JJ6CQQFRBJESV6BAMGQEQM5HT3I@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id r14sor3702371ljm.66.2021.03.12.12.03.48 (Google Transport Security); Fri, 12 Mar 2021 12:03:48 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbjesv6bamgqeqm5ht3i@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=bYNEJmfX; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcd6jj6cqqfrbjesv6bamgqeqm5ht3i@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCD6JJ6CQQFRBJESV6BAMGQEQM5HT3I@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1615579428; cv=pass; d=google.com; s=arc-20160816; b=N8CgF+3FSrJgzjdTyOV6kd6FYmYIlGU6a4dTgOSJZ0hSc9BK2HbxXLFPeq6y1xfynA DBV1/B4w1AF7d7EcNMGLNERpLlAoEoH3ePokYe3Nj+I6sZbQ1hIzYG2Kg9bJRxma2iVZ XfMrguTHpMeDR60pQ9QGe9vBx/SCpR1V/BkLS+lPonkeh+tbGYDeUVFSTCJCidPbgm3g l9EctCSYfwOFh5q0csqPxcq+OPNuqu27LE/ABcAcXcusE156kKqPJ2fLysUK9VRrupoh omSvcR4mkGTu7DrSs8wcFPvJ8JC8wTVtY8PteTBxrq8pr89Ej6p/CIF9+J0cU+ZHuzaC hEwA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=sopnZWehGnOpXJs2YM/GsM1y9d410xpQI6yrtvb2wGk=; b=0TrB1cyPXo9dX+aQdtJ+r3ibGwJMDCCutrMl2+MERlWl1NdPGaPiWo9QzoCI0D1ROi gozJmW5GrAyQ22b2lZeRORxrGoCKjRJJiOEbpaJKdiY65k/RZ569vcM/iRL43hO78VQt v+go58D1cD9tEa3Wn8ijck7vDc0WSzlU35Z/2RukA9jFLolWSPOK5Po6XWp0McDHKq44 ak+a2HZkMc0HXMQYzfvixSiRnUyM3QFmpmNPzDO7kVplJni1X/YKYmKuXWU1sPGEmUtT hf0nhGl6X3d+U1rRbi6dOYnZbcoxSvXEBUSDZQFg5UX05OESZ+qomo3OuRsGJGeuPbU/ 5X7g== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=sopnZWehGnOpXJs2YM/GsM1y9d410xpQI6yrtvb2wGk=; b=bYNEJmfXB4LPRVTZKDL/tY4dUs29ziKjESJ8uVPiDWm45WXDde1ZmJMqcK/qQ+aQZS V+f4t7QklSVN3911eVxNcwelPYUOQuIEJBsxfG4fbjkS1AcRMybIsI6EjXPO201joiL4 yCsqfpSFLDiSXKx3tIfGTuNg7hvl9IuIWWbYOE8GdUMItUi0+o7X1TT0/VYgJ8itdDVo XcQ2pZAt9dgdeNrIBII7Z55wR+OVCMAONa0c4toxVSjv0cJZ0Tx/+XokXJzFxSCVm+i2 ST14uBPP3TyuvIu3PgzWJCKGxxy4QGNtV6YysOSEvF81qFaco4WMSzCG7xE1YicblGEY tkfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=sopnZWehGnOpXJs2YM/GsM1y9d410xpQI6yrtvb2wGk=; b=prmhHfeJy4wahXIuIxvYSFx3zIUAX22gHOrxCBQ6g1faxWaAYMA4SwgCsV50tPPP4Q MWiH4IdiYbsGGCckFXqEROgKXHp4KhmRnarvCWhwOXVTSRh9qpkVjBkyS5O11IfScSTy QX8eLmSywH39VS/LP2dQtewjHDkIqjpWJWQunwEqVF+wc42kg6gTan8XiUrOMe+JGW3d BowW4Xeqddar5Ahe75g3WKpzuEb3qPcV8xz2JvOVeMh/JQddT0nTXCZsDG/gwuCIFciB +USIuVEJZDM7PrHxDAovllUhht/FZrsbIb/TBC4+NJfPTY6UzrSe7aneeUb29P1JQhG+ Eqnw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530I5pO1TpxOwQzHeOUArdUZph4eBZFa1N3n4powvxYU6XME9kpG TatMl9rPaJ/wZkSbQSLIAzQ= X-Google-Smtp-Source: ABdhPJzaCv9St07MAv5nwiRagCzRnLSvc2J8cKDqedKQsam7LbKF/4ANG80Iz7OWU6A9B5sgd7UbIA== X-Received: by 2002:a2e:8e75:: with SMTP id t21mr3396577ljk.216.1615579428267; 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-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 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; 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 X-Original-Sender: silvano.cirujano-cuesta@siemens.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1694057815103262118?= X-GMAIL-MSGID: =?utf-8?q?1694057815103262118?= 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 +