From 67aeba3668561b61e929501bbadf6dfe83f3f0f1 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 15 Jan 2013 10:18:38 -0800 Subject: [PATCH] Add zuul layout validation gate job. Non-voting for now to make sure it works. Change-Id: Iac29eba2320c8a972a03df81d10feb0183d98fd7 Reviewed-on: https://review.openstack.org/19719 Reviewed-by: Jeremy Stanley Reviewed-by: Clark Boylan Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: Jenkins --- .../config/openstack-ci-puppet.yaml | 15 +++++++++++++ .../openstack_project/files/zuul/layout.yaml | 4 ++++ tools/run-layout.sh | 22 +++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100755 tools/run-layout.sh diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml index 82046784f5..0829c395b1 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml @@ -44,6 +44,21 @@ - console-log +- job: + name: gate-config-layout + node: precise + + triggers: + - zuul + + builders: + - gerrit-git-prep + - shell: "./tools/run-layout.sh" + + publishers: + - console-log + + # This is a non-standard docs job because it uses SCP instead of FTP - job: name: ci-docs diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index e16de25164..f79631ebe5 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -100,6 +100,8 @@ jobs: - name: gate-tempest-devstack-vm-postgres branch: ^(?!stable/(diablo|essex|folsom)).*$ voting: false + - name: gate-config-layout + voting: false projects: @@ -227,10 +229,12 @@ projects: check: - gate-config-syntax - gate-config-lint + - gate-config-layout - config-compare-xml gate: - gate-config-syntax - gate-config-lint + - gate-config-layout post: - ci-docs diff --git a/tools/run-layout.sh b/tools/run-layout.sh new file mode 100755 index 0000000000..55cf3144fd --- /dev/null +++ b/tools/run-layout.sh @@ -0,0 +1,22 @@ +#!/bin/bash -e + +# Copyright 2013 OpenStack Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +rm -fr .test +mkdir .test +cd .test +git clone https://review.openstack.org/p/openstack-infra/zuul --depth 1 +cd zuul +tox -e validate-layout ../../modules/openstack_project/files/zuul/layout.yaml