From: Jon Mason <jon.mason@arm.com>
To: meta-arm@lists.yoctoproject.org
Subject: [PATCH] CI: remove zephyr specific testimage hacks
Date: Wed, 27 Jul 2022 12:56:11 -0400 [thread overview]
Message-ID: <20220727165611.7089-1-jon.mason@arm.com> (raw)
meta-zephyr recently was fixed to allow for autotest. Remove all the
zephyr testing hacks and use that.
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
.gitlab-ci.yml | 15 ++-------------
ci/testimage-zephyr.yml | 1 +
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 36cf61ac..840a6507 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,17 +41,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
#
@@ -138,7 +127,7 @@ juno:
FIRMWARE: [uboot, edk2]
microbit-v1:
- extends: .build_and_test
+ extends: .build
parallel:
matrix:
- TESTING: testimage-zephyr
@@ -159,7 +148,7 @@ qemu-cortex-a53:
extends: .build
qemu-cortex-m3:
- extends: .build_and_test
+ extends: .build
parallel:
matrix:
- TESTING: testimage-zephyr
diff --git a/ci/testimage-zephyr.yml b/ci/testimage-zephyr.yml
index 7ef051b5..83e17a70 100644
--- a/ci/testimage-zephyr.yml
+++ b/ci/testimage-zephyr.yml
@@ -6,3 +6,4 @@ local_conf_header:
IMAGE_CLASSES += "testimage"
TEST_TARGET = "QemuTargetZephyr"
TEST_SUITES = "zephyr"
+ TESTIMAGE_AUTO = "1"
--
2.17.1
next reply other threads:[~2022-07-27 16:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-27 16:56 Jon Mason [this message]
2022-07-27 21:37 ` [PATCH] CI: remove zephyr specific testimage hacks Jon Mason
2022-07-29 19:16 ` Jon Mason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220727165611.7089-1-jon.mason@arm.com \
--to=jon.mason@arm.com \
--cc=meta-arm@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.