CI: move xen specific changes out of gem5-arm64-xen.yml

Move the xen specific changes out of gem5-arm64-xen.yml.  This allows
for other xen machines in the CI.  Adding Xen machines for qemuarm and
qemuarm64 allows for more testing, which should be expanded when the Xen
Test Framework in meta-virtualization is expanded to work on arm
machines.

Signed-off-by: Jon Mason <jon.mason@arm.com>

.gitlab-ci.yml

@@ -112,7 +112,7 @@ fvp-baser-aemv8r64:
 gem5-arm64:
   extends: .build
 
-gem5-arm64-xen:
+gem5-arm64/xen:
   extends: .build
 
 gem5-atp-arm64:
@@ -145,12 +145,6 @@ n1sdp/armgcc:
 qemu-cortex-a53:
   extends: .build
 
-qemuarm/testimage:
-  extends: .build
-
-qemuarm/clang/testimage:
-  extends: .build
-
 qemuarm64-sbsa:
   extends: .build
 
@@ -166,6 +160,18 @@ qemuarm64-secureboot/clang/musl/testimage:
 qemuarm64-secureboot/musl/testimage:
   extends: .build
 
+qemuarm64/xen:
+  extends: .build
+
+qemuarm/clang/testimage:
+  extends: .build
+
+qemuarm/testimage:
+  extends: .build
+
+qemuarm/xen:
+  extends: .build
+
 qemuarmv5/testimage:
   extends: .build
 

ci/gem5-arm64-xen.yml

@@ -1,24 +0,0 @@
-
-header:
-  version: 9
-  includes:
-    - base.yml
-    - meta-openembedded.yml
-
-repos:
-  meta-arm:
-    layers:
-      meta-gem5:
-  meta-virtualization:
-    url: git://git.yoctoproject.org/meta-virtualization
-    #FIXME - remove after master branch has overrides syntax conversion patch
-    refspec: master-next
-
-machine: gem5-arm64
-
-local_conf_header:
-  meta-virt:
-    DISTRO_FEATURES:append = " virtualization xen"
-
-target:
-  - xen-image-minimal

ci/meta-arm-autonomy.yml

@@ -2,11 +2,9 @@ header:
   version: 9
   includes:
     - meta-openembedded.yml
+    - meta-virtualization.yml
 
 repos:
-  meta-virtualization:
-    url: https://git.yoctoproject.org/git/meta-virtualization
-
   meta-arm:
     layers:
       meta-arm-autonomy:

ci/meta-virtualization.yml

@@ -0,0 +1,9 @@
+header:
+  version: 9
+  includes:
+    - meta-openembedded.yml
+
+repos:
+  meta-virtualization:
+    url: git://git.yoctoproject.org/meta-virtualization
+    refspec: master-next

ci/qemuarm64.yml

@@ -0,0 +1,6 @@
+header:
+  version: 9
+  includes:
+    - base.yml
+
+machine: qemuarm64

ci/xen.yml

@@ -0,0 +1,11 @@
+header:
+  version: 9
+  includes:
+    - meta-virtualization.yml
+
+local_conf_header:
+  meta-virt:
+    DISTRO_FEATURES:append = " virtualization xen"
+
+target:
+  - xen-image-minimal