jenkins-bot has submitted this change and it was merged.
Change subject: Move tox-jessie & co. off of nodepool
......................................................................
Move tox-jessie & co. off of nodepool
Change-Id: I8424dd2315e0041676e65dfc5edd25f2126c9dd6
---
M jjb/integration.yaml
M jjb/operations-puppet.yaml
M jjb/python-jobs.yaml
M jjb/pywikibot.yaml
M zuul/layout.yaml
5 files changed, 32 insertions(+), 34 deletions(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/integration.yaml b/jjb/integration.yaml
index b8202dc..2ea0591 100644
--- a/jjb/integration.yaml
+++ b/jjb/integration.yaml
@@ -161,8 +161,8 @@
- 'integration-zuul-layoutvalidation'
- 'integration-zuul-layoutvalidation-gate'
- '{name}-puppet-validate'
- - '{name}-tox-jessie'
- - '{name}-tox-{toxenv}-jessie':
+ - '{name}-tox'
+ - '{name}-tox-{toxenv}':
toxenv:
- dib
diff --git a/jjb/operations-puppet.yaml b/jjb/operations-puppet.yaml
index 56c4dd5..0152ef6 100644
--- a/jjb/operations-puppet.yaml
+++ b/jjb/operations-puppet.yaml
@@ -57,6 +57,6 @@
jobs:
- '{name}-puppetlint-strict'
- '{name}-typos'
- - '{name}-tox-jessie'
+ - '{name}-tox'
- operations-puppet-test
- operations-puppet-doc
diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index 2dcd8ab..328f2be 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -5,8 +5,8 @@
artifacts: '.tox/*/log/*.log'
- job-template:
- name: '{name}-tox-{toxenv}-jessie'
- node: ci-jessie-wikimedia
+ name: '{name}-tox-{toxenv}'
+ node: contintLabsSlave && DebianJessie
defaults: use-remoteonly-zuul
concurrent: true
triggers:
@@ -21,8 +21,8 @@
# Same for Jessie
- job-template:
- name: 'tox-{toxenv}-jessie'
- node: ci-jessie-wikimedia
+ name: 'tox-{toxenv}'
+ node: contintLabsSlave && DebianJessie
defaults: use-remote-zuul-shallow-clone
concurrent: true
triggers:
@@ -35,24 +35,22 @@
- archive-log-dir
- castor-save
-- job-template: &job_tox-jessie
- name: 'tox-jessie'
- node: ci-jessie-wikimedia
+- job-template: &job_tox
+ name: 'tox'
+ node: contintLabsSlave && DebianJessie
defaults: use-remote-zuul-shallow-clone
concurrent: true
triggers:
- zuul
builders:
- - castor-load
- tox-all-envs
publishers:
- archive-log-dir
- archive-tox-logs
- - castor-save
- job-template:
- !!merge : *job_tox-jessie
- name: '{name}-tox-jessie'
+ !!merge : *job_tox
+ name: '{name}-tox'
# Reinject Zuul parameters since JJB strip for some reason
triggers:
- zuul
@@ -78,8 +76,8 @@
- project:
name: common-tox-jobs
jobs:
- - 'tox-jessie'
- - 'tox-{toxenv}-jessie':
+ - 'tox'
+ - 'tox-{toxenv}':
toxenv:
- doc
diff --git a/jjb/pywikibot.yaml b/jjb/pywikibot.yaml
index ff3b3f4..fcd5111 100644
--- a/jjb/pywikibot.yaml
+++ b/jjb/pywikibot.yaml
@@ -5,7 +5,7 @@
- '{name}-tox-doc-publish':
docsrc: 'docs/_build/html'
docdest: 'pywikibot'
- - '{name}-tox-{toxenv}-jessie':
+ - '{name}-tox-{toxenv}':
toxenv:
- nose
- nose34
@@ -40,7 +40,7 @@
name: pywikibot-wikibase
jobs:
- - '{name}-tox-{toxenv}-jessie':
+ - '{name}-tox-{toxenv}':
toxenv:
- nose
- nose34
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 43c9e87..3f99281 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -832,7 +832,7 @@
failure-message: 'FAILURE Failed to compare your patchset with the current
configuration.'
files: '^jjb/.*'
- - name: 'integration-config-tox-dib-jessie'
+ - name: 'integration-config-tox-dib'
files: '^dib/.*'
- name: 'integration-zuul-layoutdiff'
@@ -1204,9 +1204,9 @@
- name: tox-jessie
test:
- - tox-jessie
+ - tox
gate-and-submit:
- - tox-jessie
+ - tox
- name: commit-message-validator
check:
@@ -1233,16 +1233,16 @@
check:
- noop
test:
- - integration-config-tox-jessie
+ - integration-config-tox
- integration-config-puppet-validate
- - integration-config-tox-dib-jessie
+ - integration-config-tox-dib
- integration-jjb-config-diff
- integration-zuul-layoutdiff
- integration-zuul-layoutvalidation
gate-and-submit:
- - integration-config-tox-jessie
+ - integration-config-tox
- integration-config-puppet-validate
- - integration-config-tox-dib-jessie
+ - integration-config-tox-dib
- integration-jjb-config-diff
- integration-zuul-layoutdiff
- integration-zuul-layoutvalidation-gate
@@ -2198,7 +2198,7 @@
# Same for trusted user
test:
# testing
- - operations-puppet-tox-jessie
+ - operations-puppet-tox
- rake-jessie
# Same as `check` pipeline:
- erblint-HEAD
@@ -8185,12 +8185,12 @@
check:
- tox-jessie
test:
- - pywikibot-core-tox-nose-jessie
- - pywikibot-core-tox-nose34-jessie
+ - pywikibot-core-tox-nose
+ - pywikibot-core-tox-nose34
- tox-doc-jessie
gate-and-submit:
- - pywikibot-core-tox-nose-jessie
- - pywikibot-core-tox-nose34-jessie
+ - pywikibot-core-tox-nose
+ - pywikibot-core-tox-nose34
- tox-doc-jessie
postmerge:
- pywikibot-core-tox-doc-publish
@@ -8207,11 +8207,11 @@
template:
- name: tox-jessie
test:
- - pywikibot-wikibase-tox-nose-jessie
- - pywikibot-wikibase-tox-nose34-jessie
+ - pywikibot-wikibase-tox-nose
+ - pywikibot-wikibase-tox-nose34
gate-and-submit:
- - pywikibot-wikibase-tox-nose-jessie
- - pywikibot-wikibase-tox-nose34-jessie
+ - pywikibot-wikibase-tox-nose
+ - pywikibot-wikibase-tox-nose34
- name: pywikibot/bots/xqbot
template:
--
To view, visit https://gerrit.wikimedia.org/r/304588
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8424dd2315e0041676e65dfc5edd25f2126c9dd6
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Legoktm <[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
