.gitlab-ci.yml

@@ -46,13 +46,17 @@ aggregate-docs:
   variables:
     CI_ONIRO_GIT_REPO_PATH: oniro
 
-# Customize the .bitbake-workspace job to set the rules governing when a build
-# is attempted to: modifications (changes) to the pipeline, meta-layers,
-# flavours and assets OR to placement of a tag on a commit OR when a job is
-# scheduled. In addition, draft merge requests will no longer start the heavy
-# build jobs automatically, giving an option to the developer, to start the
-# desired jobs manually.
-.bitbake-workspace:
+# Anchor job rules, which govern if a job is instantiated in a given pipeline.
+# This job is then used as another base to several different jobs, including
+# .bitbake-workspace, .build-rauc-bundle and the
+# .publish-rauc-bundle-to-hawkbit jobs.
+#
+# The rules are: modifications (changes) to the pipeline, meta-layers, flavours
+# and assets OR to placement of a tag on a commit OR when a job is scheduled.
+# In addition, draft merge requests will no longer start the heavy build jobs
+# automatically, giving an option to the developer, to start the desired jobs
+# manually.
+.workspace-rules:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
       variables:
@@ -82,6 +86,30 @@ aggregate-docs:
     - if: '$CI_COMMIT_TAG'
       # XXX: This needs CI_ONIRO_MANIFEST_BRANCH as well, most likely.
 
+
+# The three jobs defined below override the definitions from build-generic.yaml
+# to inject .workspace-rules and the rules defined therein. It is important to
+# understand that this is based on several separate systems: parsing and
+# loading yaml, processing the include rules, and processing extends rules.
+#
+# This specific trick (ab)uses the fact that yaml-top-level is one big map of
+# entities, and we can define an entity multiple times to effectively extend or
+# replace specific elements.
+#
+# The following three jobs are equivalent to copy-pasting the modified extends
+# line into the jobs in .oniro-ci/build-generic.yaml, because map/dictionary
+# entries compute the union of the defined keys, unlike list entries or scalars
+# that replace the previous value.
+
+.bitbake-workspace:
+  extends: [.workspace, .workspace-rules]
+
+.build-rauc-bundle:
+  extends: [.build-image, .workspace-rules]
+
+.publish-rauc-bundle-to-hawkbit:
+  extends: [.workspace-rules]
+
 # Build a RAUC update bundle for Raspberry Pi 4
 bundle-raspberrypi4-64:
   extends: .build-rauc-bundle
@@ -281,14 +309,14 @@ lava-seco-c61-kselftest:
     CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/seco-c61-kselftest.yaml"
     CI_REPORT_JOB_NAME: lava-report
 
-lava-zephyr-96b-nitrogen-tests:
-  needs: [zephyr-96b-nitrogen-tests]
+lava-zephyr-96b-nitrogen-twister:
+  needs: [zephyr-96b-nitrogen-twister]
   stage: test
   extends: .lava-test
   variables:
     MACHINE: 96b-nitrogen
-    CI_BUILD_JOB_NAME: zephyr-96b-nitrogen-tests
-    CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/nitrogen-test.yaml"
+    CI_BUILD_JOB_NAME: zephyr-96b-nitrogen-twister
+    CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/nitrogen-twister.yaml"
     CI_REPORT_JOB_NAME: lava-report
 
 lava-qemu-x86-perf:
@@ -378,7 +406,7 @@ lava-report:
     - lava-raspberrypi4-64-perf
     - lava-seco-intel-b68-perf
     - lava-seco-c61-perf
-    - lava-zephyr-96b-nitrogen-tests
+    - lava-zephyr-96b-nitrogen-twister
     - lava-zephyr-qemu-cortex-m3
     - lava-zephyr-qemu-x86
     - lava-qemu-x86_64-kselftest

.oniro-ci/machines-and-flavours.yaml

@@ -120,6 +120,15 @@ zephyr-96b-nitrogen-tests:
     CI_ONIRO_BUILD_FLAVOUR: zephyr
     CI_ONIRO_INSTANCE_SIZE: s3.large.2
 
+zephyr-96b-nitrogen-twister:
+  extends: .build-image
+  variables:
+    MACHINE: 96b-nitrogen
+    CI_ONIRO_RECIPE_NAME: zephyr-kernel-test-twister
+    CI_ONIRO_BUILD_FLAVOUR: zephyr
+    CI_ONIRO_INSTANCE_SIZE: s3.large.2
+    CI_ONIRO_JOB_ARTIFACTS: "twister*.tar.bz2"
+
 zephyr-96b-avenger:
   extends: .build-zephyr
   variables:

.oniro-ci/test-generic.yaml

@@ -51,7 +51,7 @@
       set -x
       rm -rf lava_jobs && mkdir lava_jobs
       # Generate job definitions for zephyr build
-      if echo "${CI_BUILD_JOB_NAME}" | grep -i "zephyr"; then
+      if echo "${CI_BUILD_JOB_NAME}" | grep -i "zephyr" | grep -vi "twister"; then
         for image in $(find artifacts/images/${MACHINE} -name "*.elf" -exec basename {} \;); do
           image_basename=$(basename "${image}" ".elf")
           echo "--- Generating lava job definition ${image_basename}.yaml ---"