From 38c6a8df81663ad1f9efed0f76c1eddf18ea1e9b Mon Sep 17 00:00:00 2001
From: Chase Qi <chase.qi@linaro.org>
Date: Wed, 24 Aug 2022 21:04:49 +0800
Subject: [PATCH] ci: enable twister based zephyr tests on qemu machines

Add zephyr build and test jobs for the below qemu machines:
* qemu-x86
* qemu-cortex-m3

Closes https://gitlab.eclipse.org/eclipse/oniro-core/meta-zephyr/-/issues/35

Signed-off-by: Chase Qi <chase.qi@linaro.org>
---
 .gitlab-ci.yml                       | 22 ++++++++++++++++++++++
 .oniro-ci/machines-and-flavours.yaml | 22 ++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6e0376f..fa8c7be3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -468,6 +468,28 @@ lava-zephyr-96b-nitrogen-twister:
     CI_REPORT_JOB_NAME: lava-report
     CI_SQUAD_PROJECT_NAME: "zephyr"
 
+lava-zephyr-qemu-x86-twister:
+  needs: [zephyr-qemu-x86-twister-gcc]
+  stage: test
+  extends: .lava-test-scheduled
+  variables:
+    MACHINE: qemu-x86
+    CI_BUILD_JOB_NAME: zephyr-qemu-x86-twister-gcc
+    CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/qemu-x86-zephyr-tests.yaml"
+    CI_REPORT_JOB_NAME: lava-report
+    CI_SQUAD_PROJECT_NAME: "zephyr"
+
+lava-zephyr-qemu-cortex-m3-twister:
+  needs: [zephyr-qemu-cortex-m3-twister-gcc]
+  stage: test
+  extends: .lava-test-scheduled
+  variables:
+    MACHINE: qemu-cortex-m3
+    CI_BUILD_JOB_NAME: zephyr-qemu-cortex-m3-twister-gcc
+    CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/qemu-cortex-m3-zephyr-tests.yaml"
+    CI_REPORT_JOB_NAME: lava-report
+    CI_SQUAD_PROJECT_NAME: "zephyr"
+
 lava-qemu-x86-perf:
   needs: [linux-qemu-x86-gcc]
   stage: test
diff --git a/.oniro-ci/machines-and-flavours.yaml b/.oniro-ci/machines-and-flavours.yaml
index d786caa1..dd52625e 100644
--- a/.oniro-ci/machines-and-flavours.yaml
+++ b/.oniro-ci/machines-and-flavours.yaml
@@ -245,6 +245,28 @@ zephyr-96b-nitrogen-twister-gcc:
 zephyr-96b-nitrogen-twister-clang:
   extends: [.zephyr-96b-nitrogen-twister, .toolchain-clang, .broken]
 
+.zephyr-qemu-x86-twister:
+  extends: .build-zephyr-image
+  variables:
+    MACHINE: qemu-x86
+    CI_ONIRO_RECIPE_NAME: zephyr-kernel-test-twister
+    CI_ONIRO_JOB_ARTIFACTS: "twister*.tar.bz2"
+zephyr-qemu-x86-twister-gcc:
+  extends: [.zephyr-qemu-x86-twister, .toolchain-gcc]
+zephyr-qemu-x86-twister-clang:
+  extends: [.zephyr-qemu-x86-twister, .toolchain-clang, .broken]
+
+.zephyr-qemu-cortex-m3-twister:
+  extends: .build-zephyr-image
+  variables:
+    MACHINE: qemu-cortex-m3
+    CI_ONIRO_RECIPE_NAME: zephyr-kernel-test-twister
+    CI_ONIRO_JOB_ARTIFACTS: "twister*.tar.bz2"
+zephyr-qemu-cortex-m3-twister-gcc:
+  extends: [.zephyr-qemu-cortex-m3-twister, .toolchain-gcc]
+zephyr-qemu-cortex-m3-twister-clang:
+  extends: [.zephyr-qemu-cortex-m3-twister, .toolchain-clang, .broken]
+
 .zephyr-96b-avenger:
   extends: .build-zephyr-image
   variables:
-- 
GitLab