From e053655480afd15b9569bbf7e98cae75d3145156 Mon Sep 17 00:00:00 2001
From: Peter Hoyes <Peter.Hoyes@arm.com>
Date: Tue, 2 Aug 2022 11:50:50 -0400
Subject: [PATCH] CI: Use TESTIMAGE_AUTO
Now that TESTIMAGE_AUTO is available for Zephyr builds, enable it in
ci/testimage.yml and remove the redundant build_and_test base
configuration.
Remove testimage from Nios2 build as it is currently failing.
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
.gitlab-ci.yml | 17 +++--------------
ci/testimage.yml | 1 +
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68abd32..014123f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,17 +35,6 @@ stages:
paths:
- $CI_PROJECT_DIR/work/build/tmp/work*/**/temp/log.do_*.*
-# Workaround for Zephyr not currectly handling TESTIMAGE_AUTO
-.build_and_test:
- extends: .setup
- script:
- - KASFILES=$(./ci/jobs-to-kas "$CI_JOB_NAME")
- - kas shell --update --force-checkout $KASFILES -c 'cat conf/*.conf'
- - kas build $KASFILES
- - kas build $KASFILES -c testimage
- - ./ci/check-warnings $KAS_WORK_DIR/build/warnings.log
-
-
#
# Prep stage, update repositories once
#
@@ -92,10 +81,10 @@ stm32mp157c-dk2:
extends: .build
qemu-cortex-m3/testimage:
- extends: .build_and_test
+ extends: .build
-qemu-nios2/testimage:
+qemu-nios2:
extends: .build
qemu-x86/testimage:
- extends: .build_and_test
+ extends: .build
diff --git a/ci/testimage.yml b/ci/testimage.yml
index 7ef051b..83e17a7 100644
--- a/ci/testimage.yml
+++ b/ci/testimage.yml
@@ -6,3 +6,4 @@ local_conf_header:
IMAGE_CLASSES += "testimage"
TEST_TARGET = "QemuTargetZephyr"
TEST_SUITES = "zephyr"
+ TESTIMAGE_AUTO = "1"
--
GitLab