[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v1 4/6] CI: make test-artifacts branch/job customizable



Allow choosing which artifacts branch and job to use for Linux. This
allows running the same tests for different Linux versions, without
duplicating a lot of yaml sections.

Signed-off-by: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>
---
I have considered common LINUX_JOB and then add architecture suffix, but
even now X86 and ARM use different jobs, so I made them separate.
---
 .gitlab-ci.yml                 |  9 +++++++++
 automation/gitlab-ci/test.yaml |  8 ++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7974ac4e82bc..c1d92dc485e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,15 @@ variables:
   XEN_REGISTRY: registry.gitlab.com/xen-project/xen
   SELECTED_JOBS_ONLY:
     description: "Regex to select only some jobs, must be enclosed with /. For 
example /job1|job2/"
+  LINUX_ARTIFACTS_BRANCH:
+    description: "Branch in test-artifacts to use for Linux"
+    value: master
+  LINUX_JOB_X86_64:
+    description: "Job name in test-artifacts to use for Linux x86_64"
+    value: linux-6.12.34-x86_64
+  LINUX_JOB_ARM64:
+    description: "Job name in test-artifacts to use for Linux arm64"
+    value: linux-6.6.86-arm64
 
 workflow:
   name: "$CI_PIPELINE_SCHEDULE_DESCRIPTION"
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index dc08488e76f4..9fd66fb6138d 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -9,8 +9,8 @@
 
 .arm64-test-needs: &arm64-test-needs
   - project: xen-project/hardware/test-artifacts
-    job: linux-6.6.86-arm64
-    ref: master
+    job: $LINUX_JOB_ARM64
+    ref: $LINUX_ARTIFACTS_BRANCH
   - project: xen-project/hardware/test-artifacts
     job: alpine-3.18-arm64-rootfs
     ref: master
@@ -21,8 +21,8 @@
 
 .x86-64-test-needs: &x86-64-test-needs
   - project: xen-project/hardware/test-artifacts
-    job: linux-6.12.34-x86_64
-    ref: master
+    job: $LINUX_JOB_X86_64
+    ref: $LINUX_ARTIFACTS_BRANCH
   - project: xen-project/hardware/test-artifacts
     job: alpine-3.18-x86_64-rootfs
     ref: master
-- 
git-series 0.9.1



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.