Hello Paladox, jenkins-bot,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/357204
to review the following change.
Change subject: Revert "Run composer test from mediawiki-extensions jobs"
......................................................................
Revert "Run composer test from mediawiki-extensions jobs"
Conditional build step does not allow multiple shell scripts :(
This reverts commit db90837f7eeb5606e29adbceb713caaa3db7bc18.
Change-Id: I95c327dfacfdf00e7169a7cfca44a786831b64ff
---
M jjb/mediawiki.yaml
M tests/test_zuul_scheduler.py
M zuul/layout.yaml
M zuul/parameter_functions.py
4 files changed, 18 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/04/357204/1
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index c5671ee..759cd2a 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -222,13 +222,6 @@
phpflavor: '{phpflavor}'
- hhvm-clear-hhbc
- prepare-mediawiki-zuul-project
- # When triggered by an extension/skin, run its 'composer test'
- - conditional-step:
- condition-kind: regex-match
- label: '${{ENV,var="ZUUL_PROJECT"}}'
- regex: '^mediawiki/extensions/.+'
- steps:
- - composer-test-mwextension
- mw-fetch-composer-dev
- mw-run-phpunit-allexts
publishers:
diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index 0f29bfe..7b16bcd 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -140,7 +140,6 @@
any([job for job in definition
if (
job.startswith(('composer', 'mwgate-composer'))
- or job.startswith('mediawiki-extensions-')
or (job.startswith('mwext-testextension-')
and 'non-voting' not in job)
)]),
@@ -156,8 +155,7 @@
hasVotingTests = any([
job for job in definition
- if job.startswith(
- ('mwext-testextension-', 'mediawiki-extensions-'))
+ if job.startswith('mwext-testextension-')
and 'non-voting' not in job
])
hasComposerTest = any([
@@ -174,7 +172,6 @@
self.assertTrue(
any([job for job in definition
if job.endswith(('php55lint')) or
- job.startswith('mediawiki-extensions-') or
job.startswith(('composer-', 'mwgate-composer'))]),
'Project %s pipeline %s must have either '
'phplint or a composer-* job'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 24badd8..ce0e6bc 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1002,9 +1002,6 @@
gate-and-submit-swat: *extension-selenium-gate-gate-and-submit
- name: extension-gate
- check:
- - mwgate-php55lint
- - mwgate-composer-validate
test:
- mediawiki-extensions-hhvm-jessie
- mediawiki-extensions-qunit-jessie
@@ -2593,6 +2590,7 @@
- name: mediawiki/extensions/Cards
template:
+ - name: mwgate-composer
- name: extension-gate
- name: mwgate-npm
@@ -2628,6 +2626,7 @@
- name: mediawiki/extensions/Cite
template:
+ - name: mwgate-composer
- name: extension-gate
- name: mwgate-npm
@@ -2669,6 +2668,7 @@
template:
- name: extension-gate
- name: mwgate-rake
+ - name: mw-checks-test
- name: mwgate-npm
- name: extension-phan-generic
test:
@@ -3020,6 +3020,7 @@
- name: mediawiki/extensions/Elastica
template:
+ - name: mw-checks-test
- name: extension-gate
- name: mwgate-npm
@@ -3089,6 +3090,7 @@
- name: mediawiki/extensions/Flow
template:
+ - name: mwgate-composer
- name: extension-gate
- name: mwgate-rake
- name: extension-jsduck
@@ -3510,6 +3512,7 @@
template:
- name: extension-gate
- name: mwgate-rake
+ - name: mwgate-composer
- name: mwgate-npm
- name: extension-selenium
test:
@@ -3569,6 +3572,7 @@
- name: mediawiki/extensions/MwEmbedSupport
template:
+ - name: mwgate-composer
- name: extension-gate
- name: mwgate-npm
@@ -5124,6 +5128,7 @@
- name: mediawiki/extensions/SandboxLink
template:
- name: extension-gate
+ - name: mwgate-composer
- name: mwgate-npm
- name: mediawiki/extensions/Sarcasm
@@ -6247,6 +6252,7 @@
- name: mediawiki/extensions/PdfHandler
template:
+ - name: mwgate-composer
- name: extension-gate
- name: mwgate-rake
- name: mwgate-npm
@@ -6479,6 +6485,7 @@
- name: mediawiki/extensions/SiteMatrix
template:
+ - name: mwgate-composer
- name: extension-gate
- name: mwgate-npm
@@ -6584,11 +6591,13 @@
- name: mediawiki/extensions/Thanks
template:
+ - name: mwgate-composer
- name: extension-gate # T86687
- name: mwgate-npm
- name: mediawiki/extensions/TimedMediaHandler
template:
+ - name: mwgate-composer
- name: extension-gate
- name: mwgate-npm
@@ -6619,6 +6628,7 @@
- name: mediawiki/extensions/Translate
template:
+ - name: mwgate-composer
- name: extension-gate
- name: mwgate-rake
- name: mwgate-npm
@@ -6725,6 +6735,7 @@
template:
- name: extension-gate
- name: mwgate-rake
+ - name: mwgate-composer
- name: commit-message-validator
test:
- mwext-VisualEditor-npm-node-6-jessie
@@ -6877,11 +6888,14 @@
- name: mediawiki/extensions/ZeroBanner
template:
- name: extension-gate
+ - name: mw-checks-test
- name: mwgate-npm
- name: mediawiki/extensions/ZeroPortal
template:
+ - name: mwgate-composer
- name: extension-gate
+ - name: mw-checks-test
- name: mwgate-rake
- name: mwgate-npm
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 607b933..c493c31 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -385,11 +385,6 @@
'mediawiki/extensions/' + dep for dep in deps
)
- # So we can cd $EXT_NAME && composer test - T161895
- split = params['ZUUL_PROJECT'].split('/')
- if len(split) == 3 and split[1] == 'extensions':
- params['EXT_NAME'] = split[-1]
-
def nodepool_params(item, job, params):
# Instruct Jenkins Gearman plugin to put a node offline on job completion.
--
To view, visit https://gerrit.wikimedia.org/r/357204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I95c327dfacfdf00e7169a7cfca44a786831b64ff
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[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
