From eb6fd0a0feff0179a14929ba89b02661e5ada6cc Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 27 May 2026 13:25:04 -0400 Subject: [PATCH] Condense windows/libvirt/vagrant labels All libvirt hosts have vagrant-libvirt installed. All windows jobs require libvirt. Signed-off-by: David Galloway --- .../config/definitions/ceph-ansible-prs.yml | 12 ++++++------ .../config/definitions/ceph-ansible-scenario.yml | 2 +- .../config/definitions/ceph-volume-pr.yml | 2 +- .../config/definitions/ceph-volume-nightly.yml | 2 +- .../config/definitions/ceph-volume-scenario.yml | 2 +- .../definitions/ceph-windows-pull-requests.yml | 2 +- .../config/definitions/cephadm-ansible-prs.yml | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml index 198d3cc6c..7ceeae173 100644 --- 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 8f3dad53e..2881d6919 100644 --- 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 9b6fa9022..21dfbb9be 100644 --- 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&¢os9 + node: libvirt&¢os9 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 1ccf326b5..b8a5c7f87 100644 --- 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&¢os9 + node: libvirt&¢os9 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 01e33cb53..18e8dcee5 100644 --- 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&¢os9 + node: libvirt&¢os9 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 f716ae217..7f9e1490c 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 && 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 79e015cd9..d0454e5e6 100644 --- 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 -- 2.47.3