From b376543dd45442955de225a4e255a64685ee8ac3 Mon Sep 17 00:00:00 2001 From: David Moreau-Simard Date: Mon, 8 May 2017 21:06:47 -0400 Subject: [PATCH] Make the OpenStack-Ansible integration jobs voting in the ARA gate The OpenStack-Ansible integration jobs are a great and reliable way to test ARA on real playbooks from real users and since it continually tests their workflows, ARA is not as likely to merge regressions which could break their gate or any other gate using ARA. Change-Id: I382442880f7368b7c4d00c0e5bdd736d43cd7aa7 --- jenkins/jobs/ara.yaml | 2 +- jenkins/jobs/projects.yaml | 3 +-- zuul/layout.yaml | 6 ++++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/jenkins/jobs/ara.yaml b/jenkins/jobs/ara.yaml index cadbb43b2a..36f4f54ef6 100644 --- a/jenkins/jobs/ara.yaml +++ b/jenkins/jobs/ara.yaml @@ -53,7 +53,7 @@ # gate ($ZUUL_PROJECT == 'openstack/ara'), it retrieves ARA from zuul-cloner, # otherwise, PyPi. - job-template: - name: 'gate-ara-integration-openstack-ansible-func-{ostype}{suffix}' + name: 'gate-ara-integration-openstack-ansible-func-{ostype}' node: '{ostype}' wrappers: - build-timeout: diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index bfaacfe4c9..2a425b6519 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -252,8 +252,7 @@ - python-jobs - hook-{name}-rtfd - 'gate-ara-integration-{ansible_version}-{ostype}' - - 'gate-ara-integration-openstack-ansible-func-{ostype}{suffix}': - suffix: '-nv' + - 'gate-ara-integration-openstack-ansible-func-{ostype}' - project: name: arch-wg diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 48c107a532..e161e498c7 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -5809,8 +5809,8 @@ projects: - gate-ara-integration-2.1.5.0-ubuntu-xenial - gate-ara-integration-2.2.2.0-ubuntu-xenial - gate-ara-integration-latest-ubuntu-xenial - - gate-ara-integration-openstack-ansible-func-centos-7-nv - - gate-ara-integration-openstack-ansible-func-ubuntu-xenial-nv + - gate-ara-integration-openstack-ansible-func-centos-7 + - gate-ara-integration-openstack-ansible-func-ubuntu-xenial - ara-coverage-ubuntu-xenial gate: - gate-ara-integration-2.1.5.0-centos-7 @@ -5819,6 +5819,8 @@ projects: - gate-ara-integration-2.1.5.0-ubuntu-xenial - gate-ara-integration-2.2.2.0-ubuntu-xenial - gate-ara-integration-latest-ubuntu-xenial + - gate-ara-integration-openstack-ansible-func-centos-7 + - gate-ara-integration-openstack-ansible-func-ubuntu-xenial post: - ara-coverage-ubuntu-xenial