jenkins-bot has submitted this change and it was merged.
Change subject: Convert labs/tools/extdist,wikibugs2 to use generic tox jobs
......................................................................
Convert labs/tools/extdist,wikibugs2 to use generic tox jobs
Change-Id: Id768a0898cb6d5769968120a8c1d85383dcbd05d
---
M jjb/labs.yaml
M jjb/python-jobs.yaml
M zuul/layout.yaml
3 files changed, 5 insertions(+), 14 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/labs.yaml b/jjb/labs.yaml
index 42d9837..03c3d13 100644
--- a/jjb/labs.yaml
+++ b/jjb/labs.yaml
@@ -18,13 +18,6 @@
- '{name}-jslint'
- project:
- name: 'labs-tools-extdist'
- toxenv:
- - tests
- jobs:
- - '{name}-tox-{toxenv}-trusty'
-
-- project:
name: 'labs-tools-grrrit'
jobs:
- '{name}-jslint'
@@ -32,10 +25,7 @@
- project:
name: 'labs-tools-wikibugs2'
- toxenv:
- - channels
jobs:
- - '{name}-tox-{toxenv}-trusty'
- 'labs-tools-wikibugs2-autopull'
- job-template:
diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index b04ecac..befc627 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -124,6 +124,7 @@
- flake8
- flake8-bin
- py27
+ - py34
jobs:
- 'tox-{toxenv}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5bb2e1c..a4c8bfe 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2251,10 +2251,10 @@
- name: labs/tools/extdist
test:
- tox-flake8-trusty
- - labs-tools-extdist-tox-tests-trusty
+ - tox-py27-trusty
gate-and-submit:
- tox-flake8-trusty
- - labs-tools-extdist-tox-tests-trusty
+ - tox-py27-trusty
- name: labs/tools/gblrenamemon
test:
@@ -2272,10 +2272,10 @@
- name: labs/tools/wikibugs2
test:
- - labs-tools-wikibugs2-tox-channels-trusty
+ - tox-py34-trusty
- tox-flake8-trusty
gate-and-submit:
- - labs-tools-wikibugs2-tox-channels-trusty
+ - tox-py34-trusty
- tox-flake8-trusty
postmerge:
- labs-tools-wikibugs2-autopull
--
To view, visit https://gerrit.wikimedia.org/r/196451
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id768a0898cb6d5769968120a8c1d85383dcbd05d
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
