From 6d3e0cac215f007ea2419de517a6db7ce64820d4 Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Fri, 12 Jun 2015 12:06:54 -0400 Subject: [PATCH] Make kolla functional job voting Rename job to "kolla-functional-build-f21" and execute in check/gate Change-Id: Ia756902d575f864f620ae8f8a5f2c3a3115f69d6 --- jenkins/jobs/kolla.yaml | 2 +- jenkins/jobs/projects.yaml | 4 ++-- zuul/layout.yaml | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/jenkins/jobs/kolla.yaml b/jenkins/jobs/kolla.yaml index 53b35310e9..a79af962dd 100644 --- a/jenkins/jobs/kolla.yaml +++ b/jenkins/jobs/kolla.yaml @@ -1,5 +1,5 @@ - job-template: - name: '{pipeline}-kolla-functional-f21' + name: '{pipeline}-kolla-functional-build-f21' node: '{node}' wrappers: diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 51722f6de6..3c7f736078 100755 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -4536,10 +4536,10 @@ jobs: - gate-{name}-bashate - gate-{name}-pep8 - - '{pipeline}-kolla-functional-f21': + - '{pipeline}-kolla-functional-build-f21': pipeline: check node: 'devstack-f21' - - '{pipeline}-kolla-functional-f21': + - '{pipeline}-kolla-functional-build-f21': pipeline: gate node: 'devstack-f21' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 9311f869de..ff44741496 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1283,9 +1283,6 @@ jobs: - name: gate-kolla-bashate voting: false - - name: check-kolla-functional-f21 - voting: false - - name: ^(gate-)?devstack-publish-docs branch: ^master @@ -6451,10 +6448,11 @@ projects: check: - gate-kolla-bashate - gate-kolla-pep8 - - check-kolla-functional-f21 + - check-kolla-functional-build-f21 gate: - gate-kolla-bashate - gate-kolla-pep8 + - check-kolla-functional-build-f21 - name: stackforge/kwapi template: