Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196440
Change subject: Convert all other jobs to use generic tox ones
......................................................................
Convert all other jobs to use generic tox ones
Change-Id: If60a70902ae2742790653e972dc1954c8c7b9396
---
M jjb/mediawiki-extensions.yaml
M jjb/mediawiki-tools.yaml
M jjb/mobile.yaml
M jjb/operations-debs.yaml
M jjb/operations-misc.yaml
M jjb/python-jobs.yaml
M jjb/pywikibot.yaml
M jjb/wm-bots.yaml
M zuul/layout.yaml
9 files changed, 33 insertions(+), 79 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/40/196440/1
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 5ddee88..79a7df9 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -1235,13 +1235,8 @@
- project:
name: 'mwext-EventLogging'
- toxenv:
- - flake8
- - flake8-bin
- - py27
jobs:
- python-jobs
- - '{name}-tox-{toxenv}'
- project:
name: 'mwext-Flow'
diff --git a/jjb/mediawiki-tools.yaml b/jjb/mediawiki-tools.yaml
index 5fa2751..05bd0d3 100644
--- a/jjb/mediawiki-tools.yaml
+++ b/jjb/mediawiki-tools.yaml
@@ -11,32 +11,15 @@
- python-jobs
- project:
- name: 'mw-tools-release'
- toxenv:
- - flake8
- - py27
-
- jobs:
- - '{name}-tox-{toxenv}'
-
-- project:
name: 'mw-tools-releng'
- toxenv:
- - doc
jobs:
- - '{name}-tox-{toxenv}'
- '{name}-tox-doc-publish':
docsrc: 'html'
docdest: 'mw-tools-releng'
- project:
name: 'mw-tools-scap'
- toxenv:
- - doc
- - py27
- - flake8
jobs:
- - '{name}-tox-{toxenv}'
- '{name}-tox-doc-publish':
docsrc: 'docs/_build/html'
docdest: 'mw-tools-scap'
diff --git a/jjb/mobile.yaml b/jjb/mobile.yaml
index 011c1cd..cd616fc 100644
--- a/jjb/mobile.yaml
+++ b/jjb/mobile.yaml
@@ -5,11 +5,8 @@
- project:
name: 'apps-android-wikipedia'
- toxenv:
- - flake8
jobs:
- '{name}-jslint'
- - '{name}-tox-{toxenv}'
- '{name}-maven-checkstyle'
# Build the mighty Commons application for Android Platforms
diff --git a/jjb/operations-debs.yaml b/jjb/operations-debs.yaml
index c38685e..1ea91c4 100644
--- a/jjb/operations-debs.yaml
+++ b/jjb/operations-debs.yaml
@@ -204,13 +204,9 @@
- project:
name: operations-debs-pybal
- toxenv:
- - py27
- - flake8
jobs:
- '{name}-debian-glue':
distribution: trusty
- - '{name}-tox-{toxenv}'
- project:
name: 'operations-debs-varnish'
diff --git a/jjb/operations-misc.yaml b/jjb/operations-misc.yaml
index 528afc9..304df53 100644
--- a/jjb/operations-misc.yaml
+++ b/jjb/operations-misc.yaml
@@ -4,20 +4,6 @@
- python-jobs
- project:
- name: 'operations-software-ircyall'
- toxenv:
- - flake8
- jobs:
- - '{name}-tox-{toxenv}-trusty'
-
-- project:
- name: 'operations-software-labsdb-auditor'
- toxenv:
- - flake8
- jobs:
- - '{name}-tox-{toxenv}-trusty'
-
-- project:
name: 'operations-software-redactatron'
jobs:
- python-jobs
diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index 8e0dcb1..b04ecac 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -120,6 +120,7 @@
- project:
name: common-tox-jobs
toxenv:
+ - doc
- flake8
- flake8-bin
- py27
diff --git a/jjb/pywikibot.yaml b/jjb/pywikibot.yaml
index 3fe7c23..ea4d8c3 100644
--- a/jjb/pywikibot.yaml
+++ b/jjb/pywikibot.yaml
@@ -49,7 +49,6 @@
- project:
name: pywikibot-core
toxenv:
- - flake8
- flake8-py3 # must only trigger the '-trusty' version
- flake8-docstrings
- flake8-docstrings-mandatory
diff --git a/jjb/wm-bots.yaml b/jjb/wm-bots.yaml
index 212f189..9e352c0 100644
--- a/jjb/wm-bots.yaml
+++ b/jjb/wm-bots.yaml
@@ -1,7 +1,4 @@
- project:
name: wikimedia-bots-jouncebot
- toxenv:
- - flake8
jobs:
- '{name}-yamllint'
- - '{name}-tox-{toxenv}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 325e07c..72f882d 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2210,11 +2210,11 @@
- apps-android-wikipedia-jslint
test:
- apps-android-wikipedia-jslint
- - apps-android-wikipedia-tox-flake8
+ - tox-flake8
- apps-android-wikipedia-maven-checkstyle
gate-and-submit:
- apps-android-wikipedia-jslint
- - apps-android-wikipedia-tox-flake8
+ - tox-flake8
- apps-android-wikipedia-maven-checkstyle
- name: apps/ios/wikipedia
@@ -2474,30 +2474,30 @@
- name: mediawiki/tools/release
test:
- phplint
- - mw-tools-release-tox-flake8
- - mw-tools-release-tox-py27
+ - tox-flake8
+ - tox-py27
gate-and-submit:
- phplint
- - mw-tools-release-tox-flake8
- - mw-tools-release-tox-py27
+ - tox-flake8
+ - tox-py27
- name: mediawiki/tools/releng
test:
- - mw-tools-releng-tox-doc
+ - tox-doc
gate-and-submit:
- - mw-tools-releng-tox-doc
+ - tox-doc
postmerge:
- mw-tools-releng-tox-doc-publish
- name: mediawiki/tools/scap
test:
- - mw-tools-scap-tox-doc
- - mw-tools-scap-tox-flake8
- - mw-tools-scap-tox-py27
+ - tox-doc
+ - tox-flake8
+ - tox-py27
gate-and-submit:
- - mw-tools-scap-tox-doc
- - mw-tools-scap-tox-flake8
- - mw-tools-scap-tox-py27
+ - tox-doc
+ - tox-flake8
+ - tox-py27
postmerge:
- mw-tools-scap-tox-doc-publish
@@ -2587,11 +2587,11 @@
- name: operations/debs/pybal
test:
- operations-debs-pybal-debian-glue
- - operations-debs-pybal-tox-flake8
- - operations-debs-pybal-tox-py27
+ - tox-flake8
+ - tox-py27
gate-and-submit:
- - operations-debs-pybal-tox-flake8
- - operations-debs-pybal-tox-py27
+ - tox-flake8
+ - tox-py27
- name: operations/debs/varnish
test:
@@ -2716,15 +2716,15 @@
- name: operations/software/ircyall
test:
- - operations-software-ircyall-tox-flake8-trusty
+ - tox-flake8-trusty
gate-and-submit:
- - operations-software-ircyall-tox-flake8-trusty
+ - tox-flake8-trusty
- name: operations/software/labsdb-auditor
test:
- - operations-software-labsdb-auditor-tox-flake8-trusty
+ -tox-flake8-trusty
gate-and-submit:
- - operations-software-labsdb-auditor-tox-flake8-trusty
+ - tox-flake8-trusty
- name: operations/software/redactatron
template:
@@ -3321,13 +3321,13 @@
- name: extension-unittests
- name: extension-qunit
test:
- - mwext-EventLogging-tox-flake8
- - mwext-EventLogging-tox-flake8-bin
- - mwext-EventLogging-tox-py27
+ - tox-flake8
+ - tox-flake8-bin
+ - tox-py27
gate-and-submit:
- - mwext-EventLogging-tox-flake8
- - mwext-EventLogging-tox-flake8-bin
- - mwext-EventLogging-tox-py27
+ - tox-flake8
+ - tox-flake8-bin
+ - tox-py27
- name: mediawiki/extensions/ExpandTemplates
template:
@@ -6152,14 +6152,14 @@
check:
- noop
test:
- - 'pywikibot-core-tox-flake8'
+ - 'tox-flake8'
- 'pywikibot-core-tox-flake8-py3-trusty'
- 'pywikibot-core-tox-flake8-docstrings'
- 'pywikibot-core-tox-flake8-docstrings-mandatory'
- 'pywikibot-core-tox-nose'
- 'pywikibot-core-tox-nose34-trusty'
gate-and-submit:
- - 'pywikibot-core-tox-flake8'
+ - 'tox-flake8'
- 'pywikibot-core-tox-flake8-py3-trusty'
- 'pywikibot-core-tox-flake8-docstrings-mandatory'
- 'pywikibot-core-tox-nose'
@@ -6283,8 +6283,8 @@
- name: wikimedia/bots/jouncebot
test:
- - wikimedia-bots-jouncebot-tox-flake8
+ - tox-flake8
- wikimedia-bots-jouncebot-yamllint
gate-and-submit:
- - wikimedia-bots-jouncebot-tox-flake8
+ - tox-flake8
- wikimedia-bots-jouncebot-yamllint
--
To view, visit https://gerrit.wikimedia.org/r/196440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If60a70902ae2742790653e972dc1954c8c7b9396
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
