From 9ce56263fc04464eaeb6f3bfa01660e0a61cc30a Mon Sep 17 00:00:00 2001
From: Chase Qi <chase.qi@linaro.org>
Date: Thu, 19 May 2022 12:35:52 +0800
Subject: [PATCH] ci: enable twister testing on nitrogen in LAVA
Signed-off-by: Chase Qi <chase.qi@linaro.org>
---
.gitlab-ci.yml | 10 +++++-----
.oniro-ci/test-generic.yaml | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7ed9303..c83b124e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -281,14 +281,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 +378,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
diff --git a/.oniro-ci/test-generic.yaml b/.oniro-ci/test-generic.yaml
index 530c04b4..803d8db2 100644
--- a/.oniro-ci/test-generic.yaml
+++ b/.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 ---"
--
GitLab