From: David Galloway Date: Fri, 20 Oct 2017 19:35:33 +0000 (-0400) Subject: ceph-{ansible,docker}: Run jobs on centos7 slaves X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6c76658eacaaed20ad71f6807b83f9df88aeee14;p=ceph-build.git ceph-{ansible,docker}: Run jobs on centos7 slaves Signed-off-by: David Galloway --- diff --git a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml index 818b470c..8db24530 100644 --- 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&¢os7 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 ab700a10..ba6c1b5d 100644 --- 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 9f20dfbb..26c51567 100644 --- 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&¢os7 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 92d542e7..194016af 100644 --- 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&¢os7 concurrent: true defaults: global display-name: 'ceph-docker: Pull Requests [ceph_ansible-{ceph-version}-{os}-{test}]'