diff mbox series

[v6,5/5] ci: add container image testing configurations

Message ID 20210309205239.652677-6-silvano.cirujano-cuesta@siemens.com
State Superseded, archived
Headers show
Series Add support for containerized root filesystems | expand

Commit Message

Silvano Cirujano Cuesta March 9, 2021, 10:52 a.m. UTC 
Signed-off-by: Silvano Cirujano Cuesta <silvano.cirujano-cuesta@siemens.com>
---
 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 mbox series

Patch

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