From 7c2f42ae380204dd581fc3eec98b79a245e6ce7c Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 17 Nov 2016 19:36:17 +0100 Subject: [PATCH] Do not setup db for nodepool Do not use the database setup jobs for nodepool. Nodepool now has tools/test-setup.sh which sets up the database. Therefore the normal python jobs can be used, they call tools/test-setup.sh. Change-Id: Ia77c0a824c44d8a9b2f9f544e956c3e0df0757db Depends-On: I9af7c7d09b40c103af09ae8dd0e50afe3762ecba --- jenkins/jobs/projects.yaml | 4 ++-- zuul/layout.yaml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 8e36079827..9687d0006a 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -8268,8 +8268,8 @@ doc-publisher-folder: nodepool jobs: - - coverage-db-jobs - - python-db-jobs + - coverage-jobs + - python-jobs - pypi-jobs - infra-publish-jobs - '{pipeline}-dsvm-nodepool{job-suffix}': diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 4c8bc9302e..b7eecfd2e5 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2349,7 +2349,7 @@ jobs: - name: gate-dsvm-nodepool-src-shade voting: false - - name: gate-nodepool-python34-db + - name: gate-nodepool-python34 voting: false - name: gate-zuul-python34 @@ -4148,17 +4148,17 @@ projects: - name: openstack-infra/nodepool template: - name: merge-check - - name: python-db-jobs + - name: python-jobs - name: publish-to-pypi - name: infra-publish-jobs check: - - nodepool-coverage-db-ubuntu-trusty - - nodepool-coverage-db-ubuntu-xenial + - nodepool-coverage-ubuntu-trusty + - nodepool-coverage-ubuntu-xenial - gate-dsvm-nodepool - gate-dsvm-nodepool-src-shade post: - - nodepool-coverage-db-ubuntu-trusty - - nodepool-coverage-db-ubuntu-xenial + - nodepool-coverage-ubuntu-trusty + - nodepool-coverage-ubuntu-xenial - name: openstack-infra/nose-html-output template: