ceph-{ansible,docker}: Run jobs on centos7 slaves

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
index 818b470c4246d115b9d6cf14dbae8786f8c2d386..8db24530a6f1710e81540295ab05734ee4dd1c0c 100644 (file)
--- a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
+++ b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
@@ -48,7 +48,7 @@
 
 - job-template:
     name: 'ceph-ansible-nightly-{release}-{ansible_version}-{scenario}'
-    node: vagrant&&libvirt
+    node: vagrant&&libvirt&&centos7
     concurrent: true
     defaults: global
     display-name: 'ceph-ansible: Nightly [{release}-{ansible_version}-{scenario}]'

diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
index ab700a10a5aa1cf9ae8b93c701bb15ce764d47f2..ba6c1b5d2be90c1dca93e9242bf3c18791ac76a0 100644 (file)
--- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
+++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
@@ -36,7 +36,7 @@
 # they can be requested with a trigger phrase. Run on OVH.
 - project:
     name: ceph-ansible-prs-trigger-ovh
-    slave_labels: 'vagrant && libvirt && !smithi'
+    slave_labels: 'vagrant && libvirt && !smithi && centos7'
     release:
       - luminous
     ansible_version:
@@ -58,7 +58,7 @@
 # requested with a trigger phrase
 - project:
     name: ceph-ansible-prs-dev
-    slave_labels: 'vagrant && libvirt && !smithi'
+    slave_labels: 'vagrant && libvirt && !smithi && centos7'
     release:
       - dev
     ansible_version:

diff --git a/ceph-docker-nightly/config/definitions/ceph-docker-nightly.yml b/ceph-docker-nightly/config/definitions/ceph-docker-nightly.yml
index 9f20dfbbc8b0bedd03470618777faff2fc145af7..26c51567989a4b05cc36ae3db889bdcc90aa6777 100644 (file)
--- a/ceph-docker-nightly/config/definitions/ceph-docker-nightly.yml
+++ b/ceph-docker-nightly/config/definitions/ceph-docker-nightly.yml
@@ -15,7 +15,7 @@
 
 - job-template:
     name: 'ceph-docker-nightly-ceph_ansible-{ceph-version}-{os}-{test}'
-    node: vagrant&&libvirt
+    node: vagrant&&libvirt&&centos7
     concurrent: true
     defaults: global
     display-name: 'ceph-docker: Nightly tests [ceph_ansible-{ceph-version}-{os}-{test}]'

diff --git a/ceph-docker-prs/config/definitions/ceph-docker-prs.yml b/ceph-docker-prs/config/definitions/ceph-docker-prs.yml
index 92d542e74a0b15678ea64f08c577c11df2066754..194016af8ea45cc1f56b72f9b6e22d768e26b1e2 100644 (file)
--- a/ceph-docker-prs/config/definitions/ceph-docker-prs.yml
+++ b/ceph-docker-prs/config/definitions/ceph-docker-prs.yml
@@ -17,7 +17,7 @@
 
 - job-template:
     name: 'ceph-docker-prs-ceph_ansible-{ceph-version}-{os}-{test}'
-    node: vagrant&&libvirt
+    node: vagrant&&libvirt&&centos7
     concurrent: true
     defaults: global
     display-name: 'ceph-docker: Pull Requests [ceph_ansible-{ceph-version}-{os}-{test}]'