windows jobs: Can run on Noble or Jammy

Signed-off-by: David Galloway <david.galloway@ibm.com>

diff --git a/ceph-windows-image-build/config/definitions/ceph-windows-image-build.yml b/ceph-windows-image-build/config/definitions/ceph-windows-image-build.yml
index 8d6e89e190a52b76bf8fa0c26eb6823832b10804..fa382476c3d25ab05c3542d03515ecd67ab64b27 100644 (file)
--- a/ceph-windows-image-build/config/definitions/ceph-windows-image-build.yml
+++ b/ceph-windows-image-build/config/definitions/ceph-windows-image-build.yml
@@ -1,7 +1,7 @@
 - job:
     name: ceph-windows-image-build
     description: 'Builds the Ceph Windows VM image used in the CI.'
-    node: x86_64 && noble && libvirt
+    node: x86_64 && (installed-os-noble || installed-os-jammy) && libvirt
     project-type: freestyle
     defaults: global
     concurrent: false

diff --git a/ceph-windows-installer-build/config/definitions/ceph-windows-installer-build.yml b/ceph-windows-installer-build/config/definitions/ceph-windows-installer-build.yml
index e7dae36a0472c80628c95e365fe63f2697a93017..a4e2790e6947f5470c69504ca230704092471d9c 100644 (file)
--- a/ceph-windows-installer-build/config/definitions/ceph-windows-installer-build.yml
+++ b/ceph-windows-installer-build/config/definitions/ceph-windows-installer-build.yml
@@ -1,7 +1,7 @@
 - job:
     name: ceph-windows-installer-build
     description: 'Builds the Ceph Windows MSI installer.'
-    node: x86_64 && noble && libvirt
+    node: x86_64 && (installed-os-noble || installed-os-jammy) && libvirt
     project-type: freestyle
     defaults: global
     concurrent: true

diff --git a/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml b/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml
index 7f9e1490cf95e21bf45e42ec1400b590954a0275..1848522917e09b871d0b08cfb64b2df33a827004 100644 (file)
--- a/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml
+++ b/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml
@@ -3,7 +3,7 @@
     project-type: freestyle
     defaults: global
     concurrent: true
-    node: x86_64 && noble && libvirt && gigantic
+    node: x86_64 && (installed-os-noble || installed-os-jammy) && libvirt
     display-name: 'ceph-windows: Pull Requests'
     quiet-period: 5
     block-downstream: false

diff --git a/ceph-windows-test/config/definitions/ceph-windows-test.yml b/ceph-windows-test/config/definitions/ceph-windows-test.yml
index 348bc318122419f4ff5752379bc68575dc052eb3..6516ea048cd60cebeb02272fe2bfd70ebb7220b4 100644 (file)
--- a/ceph-windows-test/config/definitions/ceph-windows-test.yml
+++ b/ceph-windows-test/config/definitions/ceph-windows-test.yml
@@ -1,7 +1,7 @@
 - job:
     name: ceph-windows-test
     description: 'Runs the unit tests from a Windows build uploaded to Chacra.'
-    node: x86_64&&noble&&libvirt
+    node: x86_64 && (installed-os-noble || installed-os-jammy) && libvirt
     project-type: freestyle
     defaults: global
     concurrent: true