jenkins-bot has submitted this change and it was merged.
Change subject: Consolidate pplint-HEAD and erblint-HEAD jobs into generic jobs
......................................................................
Consolidate pplint-HEAD and erblint-HEAD jobs into generic jobs
Change-Id: I864875aa4acc577158bd735b3cf9df50dfdb6422
---
M jjb/job-templates.yaml
M jjb/mediawiki-misc.yaml
M jjb/operations-puppet.yaml
M tests/test_zuul_layout.py
M zuul/layout.yaml
5 files changed, 19 insertions(+), 99 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 2d75f5b..32e731a 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -1,16 +1,15 @@
# Generic job-templates
-- job-template:
- name: '{name}-erblint-HEAD'
+- job:
+ name: 'erblint-HEAD'
node: hasSlaveScripts && UbuntuPrecise
- defaults: use-remote-zuul-no-submodules
+ defaults: use-remote-zuul-shallow-clone
concurrent: true
triggers:
- zuul
builders:
- erblint-HEAD
-# Generic job to run JSHint
- job-template:
name: '{name}-jslint'
node: hasSlaveScripts && UbuntuPrecise
@@ -119,10 +118,10 @@
publishers:
- puppet-lint
-- job-template:
- name: '{name}-pplint-HEAD'
+- job:
+ name: 'pplint-HEAD'
node: hasSlaveScripts && UbuntuPrecise
- defaults: use-remote-zuul-no-submodules
+ defaults: use-remote-zuul-shallow-clone
concurrent: true
triggers:
- zuul
diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index 6cef6d4..77255fd 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -71,7 +71,6 @@
- '{name}-puppetlint-lenient'
- '{name}-puppetlint-strict'
- '{name}-puppet-validate'
- - '{name}-erblint-HEAD'
- '{name}-bundle17-{bundlecommand}':
bundlecommand:
- cucumber
diff --git a/jjb/operations-puppet.yaml b/jjb/operations-puppet.yaml
index 18e0e48..d5178e3 100644
--- a/jjb/operations-puppet.yaml
+++ b/jjb/operations-puppet.yaml
@@ -90,8 +90,6 @@
- '{name}-bundle-{bundlecommand}':
bundlecommand:
- rspec
- - '{name}-erblint-HEAD'
- - '{name}-pplint-HEAD'
- '{name}-puppetlint-lenient'
- '{name}-puppetlint-strict'
- '{name}-tox-{toxenv}'
@@ -102,70 +100,3 @@
- operations-puppet-test
- operations-puppet-doc
- operations-puppet-pep8
-
-# puppet modules
-#
-# To add a new puppet module, simply copy paste an existing one
-# and tweak the `name` parameter.
-- project:
- name: 'operations-puppet-cdh'
-
- jobs:
- - '{name}-erblint-HEAD'
- - '{name}-pplint-HEAD'
-
-- project:
- name: 'operations-puppet-cdh4'
-
- jobs:
- - '{name}-erblint-HEAD'
- - '{name}-pplint-HEAD'
-
-- project:
- name: 'operations-puppet-jmxtrans'
-
- jobs:
- - '{name}-erblint-HEAD'
- - '{name}-pplint-HEAD'
-
-- project:
- name: 'operations-puppet-kafka'
-
- jobs:
- - '{name}-erblint-HEAD'
- - '{name}-pplint-HEAD'
-
-- project:
- name: 'operations-puppet-mariadb'
-
- jobs:
- - '{name}-erblint-HEAD'
- - '{name}-pplint-HEAD'
-
-- project:
- name: 'operations-puppet-nginx'
-
- jobs:
- - '{name}-erblint-HEAD'
- - '{name}-pplint-HEAD'
-
-- project:
- name: 'operations-puppet-varnish'
-
- jobs:
- - '{name}-erblint-HEAD'
- - '{name}-pplint-HEAD'
-
-- project:
- name: 'operations-puppet-wikimetrics'
-
- jobs:
- - '{name}-erblint-HEAD'
- - '{name}-pplint-HEAD'
-
-- project:
- name: 'operations-puppet-zookeeper'
-
- jobs:
- - '{name}-erblint-HEAD'
- - '{name}-pplint-HEAD'
diff --git a/tests/test_zuul_layout.py b/tests/test_zuul_layout.py
index 889e5cf..62e76da 100644
--- a/tests/test_zuul_layout.py
+++ b/tests/test_zuul_layout.py
@@ -171,8 +171,8 @@
# List of jobs allowed in check* pipelines
safe_jobs = [
'phplint',
- '.*-(js|php|perl|shell|yaml|)lint',
- '.*-(pp|erb)lint-HEAD',
+ '.*-(js|perl|shell|yaml|)lint',
+ '(pp|erb)lint-HEAD',
'.*-(tabs|typos)',
'.*-pep8',
'.*-phpcs(-lenient|-strict|)-HEAD',
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5c27e9d..cf74fb8 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -368,11 +368,11 @@
- name: experiment-gating-dependencies
voting: false
- - name: ^.*-erblint-HEAD$
+ - name: erblint-HEAD
files:
- '^.*\.erb$'
- - name: ^.*-pplint-HEAD$
+ - name: pplint-HEAD
files:
- '^.*\.pp$'
@@ -1830,8 +1830,8 @@
# FIXME add merge probably
# voting since we usually do not have any unit tests
check-voter:
- - 'operations-puppet-{module}-erblint-HEAD'
- - 'operations-puppet-{module}-pplint-HEAD'
+ - 'erblint-HEAD'
+ - 'pplint-HEAD'
# Template for MediaWiki extensions.
# Run Ruby linter.
@@ -2390,20 +2390,20 @@
- name: mediawiki/vagrant
check:
- mediawiki-vagrant-puppet-validate
- - mediawiki-vagrant-erblint-HEAD
+ - erblint-HEAD
- mediawiki-vagrant-puppetlint-lenient
- mediawiki-vagrant-puppetlint-strict
test:
- mediawiki-vagrant-bundle17-cucumber
- mediawiki-vagrant-bundle17-rspec
- mediawiki-vagrant-puppet-validate
- - mediawiki-vagrant-erblint-HEAD
+ - erblint-HEAD
- mediawiki-vagrant-puppetlint-lenient
- mediawiki-vagrant-puppetlint-strict
gate-and-submit:
- mediawiki-vagrant-bundle17-cucumber
- mediawiki-vagrant-bundle17-rspec
- - mediawiki-vagrant-erblint-HEAD
+ - erblint-HEAD
- mediawiki-vagrant-puppetlint-lenient
- mediawiki-vagrant-puppetlint-strict
- mediawiki-vagrant-puppet-validate
@@ -2534,8 +2534,8 @@
- name: operations/puppet
# Only lint on submission for now, that will be voting
check:
- - operations-puppet-erblint-HEAD
- - operations-puppet-pplint-HEAD
+ - erblint-HEAD
+ - pplint-HEAD
- operations-puppet-puppetlint-lenient
- operations-puppet-puppetlint-strict
- operations-puppet-pep8
@@ -2548,8 +2548,8 @@
- operations-puppet-tox-data_admin_lint
#- operations-apache-config-lint (Broken, T72068)
# Same as `check` pipeline:
- - operations-puppet-erblint-HEAD
- - operations-puppet-pplint-HEAD
+ - erblint-HEAD
+ - pplint-HEAD
- operations-puppet-puppetlint-lenient
- operations-puppet-puppetlint-strict
- operations-puppet-pep8
@@ -2563,47 +2563,38 @@
- name: operations/puppet/cdh
template:
- name: puppet
- module: cdh
- name: operations/puppet/cdh4
template:
- name: puppet
- module: cdh4
- name: operations/puppet/jmxtrans
template:
- name: puppet
- module: jmxtrans
- name: operations/puppet/kafka
template:
- name: puppet
- module: kafka
- name: operations/puppet/mariadb
template:
- name: puppet
- module: mariadb
- name: operations/puppet/nginx
template:
- name: puppet
- module: nginx
- name: operations/puppet/varnish
template:
- name: puppet
- module: varnish
- name: operations/puppet/wikimetrics
template:
- name: puppet
- module: wikimetrics
- name: operations/puppet/zookeeper
template:
- name: puppet
- module: zookeeper
- name: operations/software
check-voter:
--
To view, visit https://gerrit.wikimedia.org/r/195022
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I864875aa4acc577158bd735b3cf9df50dfdb6422
Gerrit-PatchSet: 4
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
