jenkins-bot has submitted this change and it was merged.
Change subject: [puppet] use a single tox job
......................................................................
[puppet] use a single tox job
Thanks to Bryan Davis, operations/puppet.git is now fully flake8
compliant.
Remove operations-puppet-pep8 which was based on the slave script
/tools/puppet_pep8.py which invoked pep8 1.4.6 on each directory and was
notably slow.
Unify the pep8 and py27 tox targets in a new job:
operations-puppet-tox-jessie
Remove the target specific jobs:
operations-puppet-tox-pep8-jessie (was non voting)
operations-puppet-tox-py27-jessie (now in tox-jessie)
Bug: T114887
Change-Id: I6c2e7689874422e4257457c4feeb1bfe064f176c
---
M jjb/operations-puppet.yaml
M tests/test_zuul_scheduler.py
M zuul/layout.yaml
3 files changed, 3 insertions(+), 47 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/operations-puppet.yaml b/jjb/operations-puppet.yaml
index f5fa0d5..56c4dd5 100644
--- a/jjb/operations-puppet.yaml
+++ b/jjb/operations-puppet.yaml
@@ -11,33 +11,6 @@
builders:
- shell:
"/srv/deployment/integration/slave-scripts/bin/puppet-test-runner.sh"
-# Run pep8 per file so that individual puppet dirs
-# can specify their own .pep8 rules
-- job-template:
- name: 'operations-puppet-pep8'
- node: contintLabsSlave && UbuntuTrusty
- # Dont process other puppet submodules
- defaults: use-remote-zuul-no-submodules
- concurrent: true
-
- triggers:
- - zuul
-
- builders:
- # Requires Jenkins slave scripts
- - shell: |
- set -o pipefail
- /srv/deployment/integration/slave-scripts/tools/puppet_pep8.py . |
tee pep8.txt
- set +o pipefail
-
- publishers:
- - violations:
- pep8:
- min: 0
- max: 1
- unstable: 1
- pattern: '**/pep8.txt'
-
# Documentation for our puppet repository
- job-template:
name: 'operations-puppet-doc'
@@ -81,14 +54,9 @@
- project:
name: 'operations-puppet'
-
- toxenv:
- - pep8
- - py27
jobs:
- '{name}-puppetlint-strict'
- - '{name}-tox-{toxenv}-jessie'
- '{name}-typos'
+ - '{name}-tox-jessie'
- operations-puppet-test
- operations-puppet-doc
- - operations-puppet-pep8
diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index c5c968f..b3d5cbf 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -293,7 +293,6 @@
'.*-(js|shell|php5[35]|)lint',
'(pp|erb)lint-HEAD',
'.*-(tabs|typos)',
- 'operations-puppet-pep8',
'.*-puppet-validate',
'.*-puppetlint-strict',
'.*-whitespaces',
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 8d4cb01..539146b 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -746,14 +746,6 @@
- name: wikimedia-fundraising-civicrm
branch: (?!.*deployment.*|^contrib$)
- - name: operations-puppet-pep8
- files:
- - '^(.*\.py|tox.ini|.pep8|setup.cfg)$'
- failure-pattern:
'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/violations/'
-
- - name: ^operations-puppet-tox-pep8-jessie$
- voting: false
-
- name: operations-puppet-puppetlint-strict
voting: true
@@ -2046,20 +2038,17 @@
- erblint-HEAD
- pplint-HEAD
- operations-puppet-puppetlint-strict
- - operations-puppet-pep8
- operations-puppet-typos
# Same for trusted user
test:
# testing
- - operations-puppet-tox-pep8-jessie
- - operations-puppet-tox-py27-jessie
+ - operations-puppet-tox-jessie
+ - rake-jessie
# Same as `check` pipeline:
- erblint-HEAD
- pplint-HEAD
- operations-puppet-puppetlint-strict
- - operations-puppet-pep8
- operations-puppet-typos
- - rake-jessie
experimental:
- tox-jessie
postmerge:
--
To view, visit https://gerrit.wikimedia.org/r/294276
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6c2e7689874422e4257457c4feeb1bfe064f176c
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
