CI: update for new Kas include semantics

With Kas 2.6 included YAML files need to be relative to the repository, not the including file: https://kas.readthedocs.io/en/latest/format-changelog.html#version-11 Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
2026-04-20 23:41:08 +00:00 · 2021-12-10 15:22:05 +00:00
parent a5f0508464
commit d446f7f80b
40 changed files with 81 additions and 81 deletions
--- a/ci/armgcc.yml
+++ b/ci/armgcc.yml
@@ -1,5 +1,5 @@
 header:
-  version: 9
+  version: 11

 local_conf_header:
  cc: |
--- a/ci/base.yml
+++ b/ci/base.yml
@@ -1,5 +1,5 @@
 header:
-  version: 9
+  version: 11

 distro: poky

--- a/ci/clang.yml
+++ b/ci/clang.yml
@@ -1,5 +1,5 @@
 header:
-  version: 9
+  version: 11

 repos:
  meta-clang:
--- a/ci/corstone1000-fvp.yml
+++ b/ci/corstone1000-fvp.yml
@@ -1,8 +1,8 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
-    - meta-openembedded.yml
+    - ci/base.yml
+    - ci/meta-openembedded.yml

 local_conf_header:
    custom-local-conf: |
--- a/ci/corstone1000-mps3.yml
+++ b/ci/corstone1000-mps3.yml
@@ -1,8 +1,8 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
-    - meta-openembedded.yml
+    - ci/base.yml
+    - ci/meta-openembedded.yml

 local_conf_header:
    custom-local-conf: |
--- a/ci/corstone500.yml
+++ b/ci/corstone500.yml
@@ -1,6 +1,6 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
+    - ci/base.yml

 machine: corstone500
--- a/ci/corstone700-fvp.yml
+++ b/ci/corstone700-fvp.yml
@@ -1,7 +1,7 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
+    - ci/base.yml

 machine: corstone700-fvp

--- a/ci/corstone700-mps3.yml
+++ b/ci/corstone700-mps3.yml
@@ -1,6 +1,6 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - corstone700-fvp.yml
+    - ci/corstone700-fvp.yml

 machine: corstone700-mps3
--- a/ci/external-gccarm.yml
+++ b/ci/external-gccarm.yml
@@ -1,5 +1,5 @@
 header:
-  version: 9
+  version: 11

 local_conf_header:
  cc: |
--- a/ci/fvp-base-arm32.yml
+++ b/ci/fvp-base-arm32.yml
@@ -1,6 +1,6 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
+    - ci/base.yml

 machine: fvp-base-arm32
--- a/ci/fvp-base.yml
+++ b/ci/fvp-base.yml
@@ -1,7 +1,7 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
+    - ci/base.yml

 machine: fvp-base

--- a/ci/fvp-baser-aemv8r64.yml
+++ b/ci/fvp-baser-aemv8r64.yml
@@ -1,7 +1,7 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
+    - ci/base.yml

 machine: fvp-baser-aemv8r64

--- a/ci/fvps.yml
+++ b/ci/fvps.yml
@@ -1,9 +1,9 @@
 # Simple target to build the FVPs that are publically available

 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
+    - ci/base.yml

 machine: qemuarm64

--- a/ci/gem5-arm64.yml
+++ b/ci/gem5-arm64.yml
@@ -1,8 +1,8 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
-    - meta-openembedded.yml
+    - ci/base.yml
+    - ci/meta-openembedded.yml

 repos:
  meta-arm:
--- a/ci/gem5-atp-arm64.yml
+++ b/ci/gem5-atp-arm64.yml
@@ -1,7 +1,7 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - gem5-arm64.yml
+    - ci/gem5-arm64.yml

 repos:
  meta-arm:
--- a/ci/generic-arm64.yml
+++ b/ci/generic-arm64.yml
@@ -1,6 +1,6 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
+    - ci/base.yml

 machine: generic-arm64
--- a/ci/juno.yml
+++ b/ci/juno.yml
@@ -1,6 +1,6 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
+    - ci/base.yml

 machine: juno
--- a/ci/meta-openembedded.yml
+++ b/ci/meta-openembedded.yml
@@ -1,5 +1,5 @@
 header:
-  version: 9
+  version: 11

 repos:
  meta-openembedded:
--- a/ci/meta-virtualization.yml
+++ b/ci/meta-virtualization.yml
@@ -1,7 +1,7 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - meta-openembedded.yml
+    - ci/meta-openembedded.yml

 repos:
  meta-virtualization:
--- a/ci/meta-zephyr.yml
+++ b/ci/meta-zephyr.yml
@@ -1,7 +1,7 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - meta-openembedded.yml
+    - ci/meta-openembedded.yml

 repos:
  meta-zephyr:
--- a/ci/microbit-v1.yml
+++ b/ci/microbit-v1.yml
@@ -1,8 +1,8 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
-    - meta-zephyr.yml
+    - ci/base.yml
+    - ci/meta-zephyr.yml

 local_conf_header:
  nonbuilding_tests: |
--- a/ci/musca-b1.yml
+++ b/ci/musca-b1.yml
@@ -1,8 +1,8 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
-    - meta-zephyr.yml
+    - ci/base.yml
+    - ci/meta-zephyr.yml

 machine: musca-b1

--- a/ci/musca-s1.yml
+++ b/ci/musca-s1.yml
@@ -1,8 +1,8 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
-    - meta-openembedded.yml
+    - ci/base.yml
+    - ci/meta-openembedded.yml

 machine: musca-s1

--- a/ci/musl.yml
+++ b/ci/musl.yml
@@ -1,5 +1,5 @@
 header:
-  version: 9
+  version: 11

 local_conf_header:
  libc: |
--- a/ci/n1sdp.yml
+++ b/ci/n1sdp.yml
@@ -1,6 +1,6 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
+    - ci/base.yml

 machine: n1sdp
--- a/ci/qemu-cortex-a53.yml
+++ b/ci/qemu-cortex-a53.yml
@@ -1,8 +1,8 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
-    - meta-zephyr.yml
+    - ci/base.yml
+    - ci/meta-zephyr.yml

 local_conf_header:
  nonbuilding_tests: |
--- a/ci/qemu-cortex-m3.yml
+++ b/ci/qemu-cortex-m3.yml
@@ -1,8 +1,8 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
-    - meta-zephyr.yml
+    - ci/base.yml
+    - ci/meta-zephyr.yml

 local_conf_header:
  tclibc: |
--- a/ci/qemu-cortex-r5.yml
+++ b/ci/qemu-cortex-r5.yml
@@ -1,8 +1,8 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
-    - meta-zephyr.yml
+    - ci/base.yml
+    - ci/meta-zephyr.yml

 machine: qemu-cortex-r5

--- a/ci/qemu-generic-arm64.yml
+++ b/ci/qemu-generic-arm64.yml
@@ -1,7 +1,7 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - generic-arm64.yml
+    - ci/generic-arm64.yml

 local_conf_header:
  failing_tests: |
--- a/ci/qemuarm.yml
+++ b/ci/qemuarm.yml
@@ -1,6 +1,6 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
+    - ci/base.yml

 machine: qemuarm
--- a/ci/qemuarm64-secureboot.yml
+++ b/ci/qemuarm64-secureboot.yml
@@ -1,7 +1,7 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
+    - ci/base.yml

 machine: qemuarm64-secureboot

--- a/ci/qemuarm64.yml
+++ b/ci/qemuarm64.yml
@@ -1,6 +1,6 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
+    - ci/base.yml

 machine: qemuarm64
--- a/ci/qemuarmv5.yml
+++ b/ci/qemuarmv5.yml
@@ -1,6 +1,6 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
+    - ci/base.yml

 machine: qemuarmv5
--- a/ci/sgi575.yml
+++ b/ci/sgi575.yml
@@ -1,6 +1,6 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
+    - ci/base.yml

 machine: sgi575
--- a/ci/tc0.yml
+++ b/ci/tc0.yml
@@ -1,7 +1,7 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
+    - ci/base.yml

 machine: tc0

--- a/ci/tc1.yml
+++ b/ci/tc1.yml
@@ -1,7 +1,7 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
+    - ci/base.yml

 machine: tc1

--- a/ci/testimage-zephyr.yml
+++ b/ci/testimage-zephyr.yml
@@ -1,5 +1,5 @@
 header:
-  version: 9
+  version: 11

 local_conf_header:
  testimage: |
--- a/ci/testimage.yml
+++ b/ci/testimage.yml
@@ -1,5 +1,5 @@
 header:
-  version: 9
+  version: 11

 local_conf_header:
  testimage: |
--- a/ci/toolchains.yml
+++ b/ci/toolchains.yml
@@ -1,7 +1,7 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - base.yml
+    - ci/base.yml

 # Target is arm64 and SDK is x86-64 to ensure that we exercise both
 # architectures
--- a/ci/xen.yml
+++ b/ci/xen.yml
@@ -1,7 +1,7 @@
 header:
-  version: 9
+  version: 11
  includes:
-    - meta-virtualization.yml
+    - ci/meta-virtualization.yml

 local_conf_header:
  meta-virt: |