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