Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196446
Change subject: Convert integration/* to use generic tox jobs
......................................................................
Convert integration/* to use generic tox jobs
Change-Id: I4f153a63e2ac05363226d874f507d2734d78f731
---
M jjb/integration.yaml
M zuul/layout.yaml
2 files changed, 8 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/46/196446/1
diff --git a/jjb/integration.yaml b/jjb/integration.yaml
index 3ee3fa6..9543675 100644
--- a/jjb/integration.yaml
+++ b/jjb/integration.yaml
@@ -117,15 +117,11 @@
- project:
name: 'integration-config'
- toxenv:
- - flake8
- - py27
jobs:
- 'integration-jjb-config-diff'
- 'integration-zuul-layoutdiff'
- 'integration-zuul-layoutvalidation'
- 'integration-zuul-layoutvalidation-gate'
- - '{name}-tox-{toxenv}'
- project:
name: 'integration-docroot'
@@ -135,13 +131,9 @@
- project:
name: 'integration-jenkins'
- toxenv:
- - flake8
- - py27
jobs:
- '{name}-phpunit'
- python-jobs
- - '{name}-tox-{toxenv}'
- project:
name: 'integration-phpunit'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 81c0866..5bb2e1c 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1983,14 +1983,14 @@
check:
- noop
test:
- - integration-config-tox-flake8
- - integration-config-tox-py27
+ - tox-flake8
+ - tox-py27
- integration-jjb-config-diff
- integration-zuul-layoutdiff
- integration-zuul-layoutvalidation
gate-and-submit:
- - integration-config-tox-flake8
- - integration-config-tox-py27
+ - tox-flake8
+ - tox-py27
- integration-jjb-config-diff
- integration-zuul-layoutdiff
- integration-zuul-layoutvalidation-gate
@@ -1999,13 +1999,13 @@
check:
- phplint
test:
- - 'integration-jenkins-tox-flake8'
- - 'integration-jenkins-tox-py27'
+ - tox-flake8
+ - tox-py27
- phplint
- 'integration-jenkins-phpunit'
gate-and-submit:
- - 'integration-jenkins-tox-flake8'
- - 'integration-jenkins-tox-py27'
+ - tox-flake8
+ - tox-py27
- phplint
- 'integration-jenkins-phpunit'
--
To view, visit https://gerrit.wikimedia.org/r/196446
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f153a63e2ac05363226d874f507d2734d78f731
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
