Skip to contentSkip to conversation

CI: remove zephyr specific testimage hacks

PATCH Applied Jon Mason 2 participants 3 messages Jul 27, 2022 – Jul 29, 2022

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/1 CI: remove zephyr specific testimage hacks

meta-zephyr recently was fixed to allow for autotest. Remove all the zephyr testing hacks and use that.

---
 .gitlab-ci.yml          | 15 ++-------------
 ci/testimage-zephyr.yml |  1 +
 2 files changed, 3 insertions(+), 13 deletions(-)
.gitlab-ci.yml +2 -13
index 36cf61ac..840a6507 100644
@@ -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
ci/testimage-zephyr.yml +1 -0
index 7ef051b5..83e17a70 100644
@@ -6,3 +6,4 @@ local_conf_header:
     IMAGE_CLASSES += "testimage"
     TEST_TARGET = "QemuTargetZephyr"
     TEST_SUITES = "zephyr"
+    TESTIMAGE_AUTO = "1"
Signature · 1 line
2.17.1
Applied
#1 lore raw
Quoted 2 lines · Jon Mason

meta-zephyr recently was fixed to allow for autotest. Remove all the zephyr testing hacks and use that.

Applied, thanks!

[1/1] CI: remove zephyr specific testimage hacks

      commit: 6e4522e1c6b808838d065e36c0967a4a95cdea4f

Best regards,

Signature · 1 line
Jon Mason <[email protected]>
Applied
#2 lore raw
In reply to Jon Mason
Quoted 2 lines · Jon Mason

meta-zephyr recently was fixed to allow for autotest. Remove all the zephyr testing hacks and use that.

Applied, thanks!

[1/1] CI: remove zephyr specific testimage hacks

      commit: 6e4522e1c6b808838d065e36c0967a4a95cdea4f

Best regards,

Signature · 1 line
Jon Mason <[email protected]>