Condense windows/libvirt/vagrant labels

All libvirt hosts have vagrant-libvirt installed.  All windows jobs require libvirt.

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

diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
index 198d3cc6c47b08c3ef0bfe4af9f93bf0bf9b9e2a..7ceeae173bffcc2a5bf9f4cb34f7728cb7786d7b 100644 (file)
--- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
+++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
@@ -1,6 +1,6 @@
 - project:
     name: ceph-ansible-prs-braggi-adami
-    builder_labels: 'vagrant && libvirt && (braggi||adami)'
+    builder_labels: 'libvirt'
     distribution:
       - centos
     deployment:
@@ -23,7 +23,7 @@
 
 - project:
     name: ceph-ansible-prs
-    builder_labels: 'vagrant && libvirt && (smithi || braggi)'
+    builder_labels: 'libvirt'
     distribution:
       - centos
     deployment:
@@ -40,7 +40,7 @@
 
 - project:
     name: ceph-ansible-prs-docker2podman
-    builder_labels: 'vagrant && libvirt && (smithi || braggi)'
+    builder_labels: 'libvirt'
     distribution:
       - centos
     deployment:
@@ -52,7 +52,7 @@
 
 - project:
     name: ceph-ansible-prs-cephadm
-    builder_labels: 'vagrant && libvirt && (adami || braggi)'
+    builder_labels: 'libvirt'
     distribution:
       - centos
     deployment:
@@ -65,7 +65,7 @@
 
 - project:
     name: ceph-ansible-prs-purge-dashboard
-    builder_labels: 'vagrant && libvirt && (adami || braggi)'
+    builder_labels: 'libvirt'
     distribution:
       - centos
     deployment:
@@ -78,7 +78,7 @@
 
 - project:
     name: ceph-ansible-prs-common-trigger
-    builder_labels: 'vagrant && libvirt && (smithi || braggi)'
+    builder_labels: 'libvirt'
     distribution:
       - centos
     deployment:

diff --git a/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml b/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml
index 8f3dad53e35d0aac5d58fbedaf485f7fd40c1d76..2881d691957eb2f089039af50548c04b2211f52e 100644 (file)
--- a/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml
+++ b/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml
@@ -1,7 +1,7 @@
 
 - job:
     name: 'ceph-ansible-scenario'
-    node: vagrant&&libvirt
+    node: libvirt
     concurrent: true
     defaults: global
     display-name: 'ceph-ansible: individual scenario testing'

diff --git a/ceph-volume-cephadm-prs/config/definitions/ceph-volume-pr.yml b/ceph-volume-cephadm-prs/config/definitions/ceph-volume-pr.yml
index 9b6fa9022b3fca4078613e4bb200a95a54ca695b..21dfbb9be17f8e243f3607c85c7350951f9462d1 100644 (file)
--- a/ceph-volume-cephadm-prs/config/definitions/ceph-volume-pr.yml
+++ b/ceph-volume-cephadm-prs/config/definitions/ceph-volume-pr.yml
@@ -18,7 +18,7 @@
 - job-template:
     name: 'ceph-volume-prs-{distro}-{objectstore}-{method}-{scenario}'
     display-name: 'ceph-volume {method}: Pull Request [{distro}-{objectstore}-{scenario}]'
-    node: vagrant&&libvirt&&centos9
+    node: libvirt&&centos9
     concurrent: true
     project-type: freestyle
     defaults: global

diff --git a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml
index 1ccf326b5d13a9233504c8f139c2633fad41a5a8..b8a5c7f87bc4d23076295038ee176f9c42df37ab 100644 (file)
--- a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml
+++ b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml
@@ -23,7 +23,7 @@
 - job-template:
     name: 'ceph-volume-nightly-{ceph_branch}-{distro}-{objectstore}-{method}-{scenario}'
     display-name: 'ceph-volume {ceph_branch}: [{distro}-{objectstore}-{method}-{scenario}]'
-    node: vagrant&&libvirt&&centos9
+    node: libvirt&&centos9
     concurrent: true
     project-type: freestyle
     defaults: global

diff --git a/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml b/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml
index 01e33cb53e20ca056f49e1f7291d4c621ba0ae0e..18e8dcee5a20d5aabb274351a733c81c242fea6b 100644 (file)
--- a/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml
+++ b/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml
@@ -1,7 +1,7 @@
 
 - job:
     name: 'ceph-volume-scenario'
-    node: vagrant&&libvirt&&centos9
+    node: libvirt&&centos9
     concurrent: true
     defaults: global
     display-name: 'ceph-volume: individual scenario testing'

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 f716ae217715eb21080420f1b244bdf8496ad052..7f9e1490cf95e21bf45e42ec1400b590954a0275 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 && windows && gigantic
+    node: x86_64 && noble && libvirt && gigantic
     display-name: 'ceph-windows: Pull Requests'
     quiet-period: 5
     block-downstream: false

diff --git a/cephadm-ansible-prs/config/definitions/cephadm-ansible-prs.yml b/cephadm-ansible-prs/config/definitions/cephadm-ansible-prs.yml
index 79e015cd9facd8bc683ca118135602c37bcae20a..d0454e5e6a7c132b2728b89d3e4c66cad6bb0e97 100644 (file)
--- a/cephadm-ansible-prs/config/definitions/cephadm-ansible-prs.yml
+++ b/cephadm-ansible-prs/config/definitions/cephadm-ansible-prs.yml
@@ -1,6 +1,6 @@
 - project:
     name: cephadm-ansible-prs-syntax
-    worker_labels: 'vagrant && libvirt && !centos9'
+    worker_labels: 'libvirt && !centos9'
     scenario:
       - flake8
       - mypy
@@ -10,7 +10,7 @@
 
 - project:
     name: cephadm-ansible-prs-functional
-    worker_labels: 'vagrant && libvirt && !centos9'
+    worker_labels: 'libvirt && !centos9'
     distribution:
       - el9
       - el10