From c0bc7e9e8fedb125c9d6b02dacf182e81c636b9c Mon Sep 17 00:00:00 2001
From: Jon Mason <jon.mason@arm.com>
Date: Thu, 5 Aug 2021 09:34:46 -0400
Subject: [PATCH] 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             | 20 +++++++++++++-------
 ci/gem5-arm64-xen.yml      | 24 ------------------------
 ci/meta-arm-autonomy.yml   |  4 +---
 ci/meta-virtualization.yml |  9 +++++++++
 ci/qemuarm64.yml           |  6 ++++++
 ci/xen.yml                 | 11 +++++++++++
 6 files changed, 40 insertions(+), 34 deletions(-)
 delete mode 100644 ci/gem5-arm64-xen.yml
 create mode 100644 ci/meta-virtualization.yml
 create mode 100644 ci/qemuarm64.yml
 create mode 100644 ci/xen.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 98a79087..bbd4c916 100644
--- a/.gitlab-ci.yml
+++ b/.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
 
diff --git a/ci/gem5-arm64-xen.yml b/ci/gem5-arm64-xen.yml
deleted file mode 100644
index f71ffca3..00000000
--- a/ci/gem5-arm64-xen.yml
+++ /dev/null
@@ -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
diff --git a/ci/meta-arm-autonomy.yml b/ci/meta-arm-autonomy.yml
index 4402b968..260750af 100644
--- a/ci/meta-arm-autonomy.yml
+++ b/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:
diff --git a/ci/meta-virtualization.yml b/ci/meta-virtualization.yml
new file mode 100644
index 00000000..b7e15b2a
--- /dev/null
+++ b/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
diff --git a/ci/qemuarm64.yml b/ci/qemuarm64.yml
new file mode 100644
index 00000000..cc29c750
--- /dev/null
+++ b/ci/qemuarm64.yml
@@ -0,0 +1,6 @@
+header:
+  version: 9
+  includes:
+    - base.yml
+
+machine: qemuarm64
diff --git a/ci/xen.yml b/ci/xen.yml
new file mode 100644
index 00000000..d0c1765e
--- /dev/null
+++ b/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