From fa73799ed9d63fe34b0ca6c6e82b8c511fc6b0ed Mon Sep 17 00:00:00 2001 From: David Galloway Date: Tue, 3 Oct 2017 16:20:23 -0400 Subject: [PATCH] ceph-ansible-prs: limit certain scenarios to smithi nodes Requested by leseb: * luminous-ansible2.3-xenial_cluster * luminous-ansible2.3-centos7_cluster * luminous-ansible2.3-docker_cluster * luminous-ansible2.3-purge_cluster * luminous-ansible2.3-update_cluster * luminous-ansible2.3-cluster * luminous-ansible2.3-update_docker_cluster * luminous-ansible2.3-switch_to_containers * luminous-ansible2.3-purge_docker_cluster Signed-off-by: David Galloway --- .../config/definitions/ceph-ansible-prs.yml | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml index 4a063ec2..7adbe46a 100644 --- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml +++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml @@ -1,6 +1,7 @@ -# tests that will auto start for every PR created +# tests that will auto start for every PR created and run on smithi - project: name: ceph-ansible-prs-auto + slave_labels: 'vagrant && libvirt && smithi' release: - luminous ansible_version: @@ -14,9 +15,27 @@ - 'ceph-ansible-prs-auto' # tests that will not auto start when a PR is created, but -# they can be requested with a trigger phrase +# they can be requested with a trigger phrase. Run on smithi. - project: - name: ceph-ansible-prs-trigger + name: ceph-ansible-prs-trigger-smithi + slave_labels: 'vagrant && libvirt && smithi' + release: + - luminous + ansible_version: + - ansible2.3 + scenario: + - purge_cluster + - update_docker_cluster + - switch_to_containers + - purge_docker_cluster + jobs: + - 'ceph-ansible-prs-trigger' + +# tests that will not auto start when a PR is created, but +# they can be requested with a trigger phrase. Run on OVH. +- project: + name: ceph-ansible-prs-trigger-ovh + slave_labels: 'vagrant && libvirt && !smithi' release: - luminous ansible_version: @@ -30,18 +49,14 @@ - docker_cluster_collocation - docker_dedicated_journal - docker_dmcrypt_journal_collocation - - purge_cluster - purge_dmcrypt - update_dmcrypt - - purge_docker_cluster - - update_docker_cluster - bluestore_cluster - bluestore_journal_collocation - bluestore_dmcrypt_journal - bluestore_dmcrypt_journal_collocation - bluestore_docker_dedicated_journal - bluestore_docker_dmcrypt_journal_collocation - - switch_to_containers - shrink_mon - shrink_mon_container - shrink_osd @@ -54,6 +69,7 @@ # requested with a trigger phrase - project: name: ceph-ansible-prs-dev + slave_labels: 'vagrant && libvirt && !smithi' release: - dev ansible_version: @@ -67,7 +83,7 @@ - job-template: name: 'ceph-ansible-prs-{release}-{ansible_version}-{scenario}' id: 'ceph-ansible-prs-auto' - node: vagrant&&libvirt + node: '{slave_labels}' concurrent: true defaults: global display-name: 'ceph-ansible: Pull Requests [{release}-{ansible_version}-{scenario}]' @@ -138,7 +154,7 @@ - job-template: name: 'ceph-ansible-prs-{release}-{ansible_version}-{scenario}' id: 'ceph-ansible-prs-trigger' - node: vagrant&&libvirt + node: '{slave_labels}' concurrent: true defaults: global display-name: 'ceph-ansible: Pull Requests [{release}-{ansible_version}-{scenario}]' -- 2.47.3