From: David Galloway <david.galloway@ibm.com>
Date: Thu, 28 May 2026 14:36:11 +0000 (-0400)
Subject: windows jobs: Can run on Noble or Jammy
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d84451c29a61f6e36b738563012c436af117cca6;p=ceph-build.git

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 8d6e89e19..fa382476c 100644
--- 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 e7dae36a0..a4e2790e6 100644
--- 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 7f9e1490c..184852291 100644
--- 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 348bc3181..6516ea048 100644
--- 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