jenkins-bot has submitted this change and it was merged.
Change subject: Migrate some repo to use the generic tox-jessie
......................................................................
Migrate some repo to use the generic tox-jessie
Since the tox.*jessie jobs are running on Nodepool, that consumes a
bunch of instances. Additionally, that is not on par with what we do for
npm/composer which delegates the definition of scripts to run to the
developers.
So migrate to just run 'tox' and let developers define the envs they
want via `envlist`.
Touch repos:
integration/config
integration/dashboard
integration/jenkins
labs/tools/gblrenamemon
labs/tools/heritage
labs/tools/wikibugs2
mediawiki/tools/release , will now run 'flake83'
mediawiki/tools/scap
wikimedia/bots/jouncebot
Change-Id: I39d56bff0c64fc7eb7184aec68f929f3979b19c8
---
M zuul/layout.yaml
1 file changed, 20 insertions(+), 38 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 73ad46c..210641e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1982,16 +1982,14 @@
check:
- noop
test:
- - tox-flake8-jessie
- - tox-py27-jessie
+ - tox-jessie
- integration-config-puppet-validate
- integration-config-tox-dib-jessie
- integration-jjb-config-diff
- integration-zuul-layoutdiff
- integration-zuul-layoutvalidation
gate-and-submit:
- - tox-flake8-jessie
- - tox-py27-jessie
+ - tox-jessie
- integration-config-puppet-validate
- integration-config-tox-dib-jessie
- integration-jjb-config-diff
@@ -2000,21 +1998,19 @@
- name: integration/dashboard
test:
- - tox-flake8-jessie
+ - tox-jessie
gate-and-submit:
- - tox-flake8-jessie
+ - tox-jessie
- name: integration/jenkins
check:
- phplint
test:
- - tox-flake8-jessie
- - tox-py27-jessie
+ - tox-jessie
- phplint
- phpunit
gate-and-submit:
- - tox-flake8-jessie
- - tox-py27-jessie
+ - tox-jessie
- phplint
- phpunit
@@ -2262,11 +2258,9 @@
- name: labs/tools/extdist
test:
- - tox-flake8-jessie
- - tox-py27-jessie
+ - tox-jessie
gate-and-submit:
- - tox-flake8-jessie
- - tox-py27-jessie
+ - tox-jessie
- name: labs/tools/forrestbot
test:
@@ -2278,9 +2272,9 @@
- name: labs/tools/gblrenamemon
test:
- - tox-flake8-jessie
+ - tox-jessie
gate-and-submit:
- - tox-flake8-jessie
+ - tox-jessie
- name: labs/tools/grrrit
template:
@@ -2288,19 +2282,15 @@
- name: labs/tools/heritage
test:
- - tox-flake8-jessie
- - tox-py27-jessie
+ - tox-jessie
gate-and-submit:
- - tox-flake8-jessie
- - tox-py27-jessie
+ - tox-jessie
- name: labs/tools/wikibugs2
test:
- - tox-py34-jessie
- - tox-flake8-jessie
+ - tox-jessie
gate-and-submit:
- - tox-py34-jessie
- - tox-flake8-jessie
+ - tox-jessie
postmerge:
- labs-tools-wikibugs2-autopull
@@ -2597,12 +2587,10 @@
- jsonlint
test:
- phplint
- - tox-flake8-jessie
- - tox-py27-jessie
+ - tox-jessie
gate-and-submit:
- phplint
- - tox-flake8-jessie
- - tox-py27-jessie
+ - tox-jessie
- name: mediawiki/tools/releng
test:
@@ -2614,13 +2602,9 @@
- name: mediawiki/tools/scap
test:
- - tox-doc-jessie
- - tox-flake8-jessie
- - tox-py27-jessie
+ - tox-jessie
gate-and-submit:
- - tox-doc-jessie
- - tox-flake8-jessie
- - tox-py27-jessie
+ - tox-jessie
postmerge:
- mw-tools-scap-tox-doc-publish
@@ -8024,11 +8008,9 @@
- name: wikimedia/bots/jouncebot
test:
- - tox-flake8-jessie
- - tox-py27-jessie
+ - tox-jessie
gate-and-submit:
- - tox-flake8-jessie
- - tox-py27-jessie
+ - tox-jessie
- name: avro-php
template:
--
To view, visit https://gerrit.wikimedia.org/r/242292
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I39d56bff0c64fc7eb7184aec68f929f3979b19c8
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
