ci: don't autorev qemuarm64

* Split the autorev local.conf settings to thier own mix-in file * Include the autorev mix-in for generic*.yml * Don't inlcude autorev min-in for qemuarm64. As this is the config that is used to test meta-openamp general usage, testing w/o autorev is one more thing to test. Signed-off-by: Bill Mills <[email protected]>
OpenAMP · Jul 5, 2024 · a541c40 · a541c40
1 parent 256f904
commit a541c40
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/ci/ci-autorev.yml b/ci/ci-autorev.yml
@@ -0,0 +1,9 @@
+header:
+  version: 9
+
+local_conf_header:
+  autorev: |
+    PREFERRED_PROVIDER_libmetal = "libmetal-dev"
+    PREFERRED_PROVIDER_open-amp = "open-amp-dev"
+    OPENAMP_SYS_REF_SRCREV = "${AUTOREV}"
+    OPENAMP_SYS_REF_BRANCH = "main"
diff --git a/ci/generic-armv7a.yml b/ci/generic-armv7a.yml
@@ -2,6 +2,7 @@ header:
   version: 9
   includes:
     - openamp.yml
+    - ci-autorev.yml
     - meta-openamp-bsp.yml
 
 machine: generic-armv7a

diff --git a/ci/genericarm64.yml b/ci/genericarm64.yml
@@ -2,6 +2,7 @@ header:
   version: 9
   includes:
     - openamp.yml
+    - ci-autorev.yml
     - meta-openamp-bsp.yml
 
 machine: genericarm64

diff --git a/ci/openamp.yml b/ci/openamp.yml
@@ -43,10 +43,6 @@ local_conf_header:
     PACKAGE_INSTALL_EXTRAS = "rsync iproute2 dropbear kernel-modules"
     IMAGE_INSTALL:append = " ${PACKAGE_INSTALL_EXTRAS} "
     PREFERRED_PROVIDER_virtual/kernel = "linux-openamp"
-    PREFERRED_PROVIDER_libmetal = "libmetal-dev"
-    PREFERRED_PROVIDER_open-amp = "open-amp-dev"
-    OPENAMP_SYS_REF_SRCREV = "${AUTOREV}"
-    OPENAMP_SYS_REF_BRANCH = "main"
 
   openamp: |
     DISTRO_FEATURES:append = " openamp"

diff --git a/ci/qemuarm64.yml b/ci/qemuarm64.yml
@@ -7,7 +7,9 @@ machine: qemuarm64
 
 # Use qemuarm64 to test other things in meta-openamp
 # use linux-yocto not linux-openamp
-# build topenamp-image-minimal
+# build openamp-image-minimal
+# don't autorev the libraries and examples
+# don't include the meta-openamp-bsp layer
 
 local_conf_header:
   machine: |