From fd80460a35dadb5ade041cfe138710016f50c571 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Mon, 15 Sep 2014 14:28:27 -0700 Subject: [PATCH] Switch infra to new puppet apply job The new job is an integration test between config and puppet modules. Start using it. Add it to puppet-storyboard. Also, correct the names of the puppet lint/syntax jobs that were inexplicably set to 'config'. Change-Id: I48c0681a30d507bd7627d6b73c529e2074993d9a --- .../jenkins_job_builder/config/infra.yaml | 4 --- .../jenkins_job_builder/config/macros.yaml | 5 ---- .../jenkins_job_builder/config/projects.yaml | 9 +++++- .../config/puppet-module-jobs.yaml | 28 ------------------- .../openstack_project/files/zuul/layout.yaml | 22 ++++++++------- 5 files changed, 20 insertions(+), 48 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/infra.yaml b/modules/openstack_project/files/jenkins_job_builder/config/infra.yaml index 79a93f253a..17f1fc4895 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/infra.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/infra.yaml @@ -114,10 +114,6 @@ publishers: - console-log -- builder: - name: infra-puppet-apply - builders: - - job-template: name: 'gate-infra-puppet-apply-{ostype}' node: 'bare-{ostype}' diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml index 62b62a894f..43ab0aa139 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml @@ -118,11 +118,6 @@ erb -x -T '-' $f | ruby -c done -- builder: - name: puppet-apply - builders: - - shell: "./test.sh" - - builder: name: ruby-191-prep builders: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index 82596b2537..fa6f60d657 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -274,7 +274,6 @@ jobs: - puppet-check-jobs - - gate-{name}-puppet-apply - gate-{name}-pep8 - gate-{name}-bashate - experimental-swift-logs-{name}-pep8 @@ -1548,6 +1547,14 @@ - '{name}-js-release-{branch-designator}': branch-designator: 'branch' +- project: + name: puppet-storyboard + node: 'bare-precise || bare-trusty' + tarball-site: tarballs.openstack.org + + jobs: + - puppet-check-jobs + - project: name: vinz node: 'bare-precise || bare-trusty' diff --git a/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml index 954c8c85a1..6c46c64ac7 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml @@ -46,34 +46,6 @@ - 'gate-{name}-puppet-lint' - 'gate-{name}-puppet-syntax' -- job-template: - name: 'gate-{name}-puppet-apply-precise' - node: 'bare-precise || bare-trusty' - - builders: - - gerrit-git-prep - - puppet-apply - - publishers: - - console-log - -- job-template: - name: 'gate-{name}-puppet-apply-centos6' - node: bare-centos6 - - builders: - - gerrit-git-prep - - puppet-apply - - publishers: - - console-log - -- job-group: - name: 'gate-{name}-puppet-apply' - jobs: - - 'gate-{name}-puppet-apply-centos6' - - 'gate-{name}-puppet-apply-precise' - - job-group: name: 'puppet-module-unit' puppet_version: diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 7a34579524..41fee7d054 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -2936,26 +2936,24 @@ projects: - gate-config-pep8 - gate-config-bashate - gate-config-puppet-syntax - - gate-config-puppet-apply-precise - - gate-config-puppet-apply-centos6 - gate-config-irc-access - gate-config-projects-yaml - gate-ci-docs + - gate-infra-puppet-apply-precise + - gate-infra-puppet-apply-centos6 gate: - gate-config-layout - gate-config-pep8 - gate-config-puppet-syntax - - gate-config-puppet-apply-precise - - gate-config-puppet-apply-centos6 - gate-config-irc-access - gate-config-projects-yaml - gate-ci-docs + - gate-infra-puppet-apply-precise + - gate-infra-puppet-apply-centos6 post: - ci-docs experimental: - experimental-swift-logs-config-pep8 - - gate-infra-puppet-apply-precise - - gate-infra-puppet-apply-centos6 - name: openstack-infra/devstack-gate template: @@ -3235,11 +3233,15 @@ projects: template: - name: merge-check check: - - gate-config-puppet-lint - - gate-config-puppet-syntax + - gate-puppet-storyboard-puppet-lint + - gate-puppet-storyboard-puppet-syntax + - gate-infra-puppet-apply-precise + - gate-infra-puppet-apply-centos6 gate: - - gate-config-puppet-lint - - gate-config-puppet-syntax + - gate-puppet-storyboard-puppet-lint + - gate-puppet-storyboard-puppet-syntax + - gate-infra-puppet-apply-precise + - gate-infra-puppet-apply-centos6 - name: openstack-infra/puppet-vinz template: