opendev/system-config
Code Issues Proposed changes

Merge "Validate that zuul-referenced jobs exist"

Browse Source
This commit is contained in:
Jenkins 2013-07-31 16:05:13 +00:00 committed by Gerrit Code Review
commit 6a6a7ba8b8
4 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
View File

@ -197,9 +197,7 @@
tarball-site: tarballs.openstack.org
jobs:
- gate-{name}-pep8
- gate-{name}-pyflakes
- '{name}-tarball'
- python-jobs
- pypi-jobs
@ -211,9 +209,7 @@
tarball-site: tarballs.openstack.org
jobs:
- gate-{name}-pep8
- gate-{name}-pyflakes
- '{name}-tarball'
- python-jobs
- pypi-jobs
@ -454,7 +450,7 @@
tarball-site: tarballs.openstack.org
jobs:
- '{name}-tarball'
- python-jobs
- pypi-jobs

3
modules/openstack_project/files/zuul/layout-dev.yaml
View File

@ -96,12 +96,10 @@ projects:
- name: openstack-infra/gerritbot
check:
- gate-gerritbot-pep8
- gate-gerritbot-pyflakes
- name: openstack-infra/gerritlib
check:
- gate-gerritlib-pep8
- gate-gerritlib-pyflakes
- name: openstack-infra/jeepyb
check:
@ -151,7 +149,6 @@ projects:
- name: openstack-infra/statusbot
check:
- gate-statusbot-pep8
- gate-statusbot-pyflakes
- name: openstack/cinder
check:

22
modules/openstack_project/files/zuul/layout.yaml
View File

@ -229,10 +229,8 @@ projects:
- name: openstack-infra/gerritbot
check:
- gate-gerritbot-pep8
- gate-gerritbot-pyflakes
gate:
- gate-gerritbot-pep8
- gate-gerritbot-pyflakes
post:
- gerritbot-branch-tarball
pre-release:
@ -246,10 +244,8 @@ projects:
- name: openstack-infra/gerritlib
check:
- gate-gerritlib-pep8
- gate-gerritlib-pyflakes
gate:
- gate-gerritlib-pep8
- gate-gerritlib-pyflakes
pre-release:
- gerritlib-tarball
release:
@ -393,7 +389,6 @@ projects:
pre-release:
- storyboard-tarball
release:
- storyboard-docs
- storyboard-tarball:
- storyboard-pypi-upload:
- post-mirror-python26
@ -408,10 +403,8 @@ projects:
- name: openstack-infra/statusbot
check:
- gate-statusbot-pep8
- gate-statusbot-pyflakes
gate:
- gate-statusbot-pep8
- gate-statusbot-pyflakes
post:
- statusbot-branch-tarball
pre-release:
@ -558,14 +551,14 @@ projects:
- gate-django_openstack_auth-python27
- gate-django_openstack_auth-noop
post:
- python-django_openstack_auth-branch-tarball
- python-django_openstack_auth-coverage
- django_openstack_auth-branch-tarball
- django_openstack_auth-coverage
pre-release:
- python-django_openstack_auth-tarball
- django_openstack_auth-tarball
release:
- python-django_openstack_auth-tarball:
- python-django_openstack_auth-pypi-upload
- python-django_openstack_auth-docs
- django_openstack_auth-tarball:
- django_openstack_auth-pypi-upload
- django_openstack_auth-docs
- name: openstack/keystone
check:
@ -1112,12 +1105,9 @@ projects:
post:
- hacking-branch-tarball
- hacking-coverage
- hacking-docs
pre-release:
- hacking-docs
- hacking-tarball
release:
- hacking-docs
- hacking-tarball:
- hacking-pypi-upload:
- post-mirror-python26

23
tools/run-layout.sh
View File

@ -23,14 +23,27 @@ then
echo
echo "ORG: The project organization (eg 'openstack')"
echo "PROJECT: The project name (eg 'nova')"
#TODO: make fatal in subsequent change: exit 1
exit 1
else
/usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
fi
rm -fr .test
mkdir .test
mkdir -p .test
cd .test
git clone https://review.openstack.org/p/openstack-infra/zuul --depth 1
[ -d zuul ] || git clone https://review.openstack.org/p/openstack-infra/zuul --depth 1
[ -d jenkins-job-builder ] || git clone https://review.openstack.org/p/openstack-infra/jenkins-job-builder --depth 1
cd jenkins-job-builder
# These are $WORKSPACE/.test/jenkins-job-builder/.test/...
mkdir -p .test/new/config
mkdir -p .test/new/out
cd ../..
cp modules/openstack_project/files/jenkins_job_builder/config/* .test/jenkins-job-builder/.test/new/config
cd .test/jenkins-job-builder
tox -e compare-xml-new
cd ..
find jenkins-job-builder/.test/new/out/ -printf "%f\n" > job-list.txt
cd zuul
tox -e validate-layout ../../modules/openstack_project/files/zuul/layout.yaml
tox -e venv -- zuul-server -c etc/zuul.conf-sample -l ../../modules/openstack_project/files/zuul/layout.yaml -t ../job-list.txt