openstack/project-config
Code Issues Proposed changes

Use old puppet syntax job on system-config

Browse Source 
The infra puppet modules do not yet have Gemfiles like the OpenStack
puppet modules do. For now, they have to use the macro to perform the
task. As the infra modules start supporting the standard method, these
can be converted to puppet-check-jobs.

Change-Id: I698162023e9a7be0bef375c092dd6a70535b8bb2
This commit is contained in:
Monty Taylor 2015-07-03 12:08:27 -04:00 committed by Jeremy Stanley
parent 9353e1c0f6
commit 6fc7b1b771
3 changed files with 101 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jenkins/jobs/macros.yaml
View File

@ -203,6 +203,15 @@
rake lint 2>&1
fi
- builder:
name: puppet-syntax
builders:
- shell: |
find . -iname *.pp | xargs puppet parser validate --modulepath=`pwd`/modules
for f in `find . -iname *.erb` ; do
erb -x -T '-' $f | ruby -c
done
# note that this job uses an in-repo script for execution
# in order to cater for differing requirements per branch
- builder:

13
jenkins/jobs/puppet-module-jobs.yaml
View File

@ -142,6 +142,18 @@
publishers:
- console-log
- job-template:
name: 'gate-{name}-puppet-syntax'
node: '{node}'
builders:
- revoke-sudo
- gerrit-git-prep
- puppet-syntax
publishers:
- console-log
- job-template:
name: 'gate-{name}-puppet-syntax-{puppet_version}'
node: '{node}'
@ -171,6 +183,7 @@
- 4
jobs:
- 'gate-{name}-puppet-lint'
- 'gate-{name}-puppet-syntax'
- 'gate-{name}-puppet-syntax-{puppet_version}'
- job-group:

149
zuul/layout.yaml
View File

@ -484,6 +484,14 @@ project-templates:
- gate-{name}-puppet-syntax-3
- gate-{name}-puppet-syntax-4
- name: infra-puppet-check-jobs
check:
- gate-{name}-puppet-lint
- gate-{name}-puppet-syntax
gate:
- gate-{name}-puppet-lint
- gate-{name}-puppet-syntax
- name: puppet-check-jobs
check:
- gate-{name}-puppet-lint
@ -5099,13 +5107,13 @@ projects:
- name: openstack-infra/puppet-accessbot
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-ansible
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-apparmor
@ -5116,43 +5124,43 @@ projects:
- name: openstack-infra/puppet-apps_site
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-askbot
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-asterisk
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-bandersnatch
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-bugdaystats
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-bup
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-cgit
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-dashboard
@ -5163,79 +5171,79 @@ projects:
- name: openstack-infra/puppet-diskimage_builder
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-drupal
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-elastic_recheck
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-elasticsearch
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-etherpad_lite
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-exim
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-gerrit
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-gerritbot
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-github
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-graphite
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-haveged
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-hound
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-httpd
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
release:
- puppet-httpd-forge-upload
@ -5243,218 +5251,218 @@ projects:
- name: openstack-infra/puppet-iptables
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-jeepyb
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-jenkins
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-kerberos
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-kibana
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-lodgeit
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-log_processor
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-logrotate
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-logstash
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-mailman
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-mediawiki
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-meetbot
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-mysql_backup
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-nodepool
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-openafs
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-openstackci
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: puppet-beaker-jobs
- name: openstack-infra/puppet-openstackid
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-os_client_config
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-packagekit
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-pgsql_backup
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-phabricator
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-pip
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-planet
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-project_config
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-puppet
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-redis
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-refstack
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-releasestatus
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-reviewday
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-simpleproxy
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-snmpd
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-ssh
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-ssl_cert_check
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-stackalytics
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-statusbot
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-storyboard
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
release:
- puppet-storyboard-forge-upload
@ -5462,43 +5470,43 @@ projects:
- name: openstack-infra/puppet-subunit2sql
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-sudoers
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-tmpreaper
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-ulimit
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-unattended_upgrades
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-unbound
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-user
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-vcsrepo
@ -5509,24 +5517,24 @@ projects:
- name: openstack-infra/puppet-vinz
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: openstack-infra/puppet-yum
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-zanata
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-zuul
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: puppet-beaker-jobs
@ -5677,15 +5685,16 @@ projects:
- name: merge-check
- name: infra-puppet-apply-jobs
- name: infra-publish-jobs
- name: puppet-syntax
check:
- gate-system-config-pep8
- gate-system-config-bashate
- gate-system-config-nodepool
- gate-system-config-puppet-syntax
gate:
- gate-system-config-pep8
- gate-system-config-bashate
- gate-system-config-nodepool
- gate-system-config-puppet-syntax
experimental:
- experimental-swift-logs-system-config-pep8-centos6