jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404229 )
Change subject: scholarships: use composer-php56-jessie
......................................................................
scholarships: use composer-php56-jessie
This change also add php56lint to jobs allowed for check* pipelines and
removes the non unused php53lint job.
Bug: T184885
Change-Id: If37202d169827c2f72d9c8adbabe6510185c9565
---
M tests/test_zuul_scheduler.py
M zuul/layout.yaml
2 files changed, 10 insertions(+), 5 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index 056db8b..ec6e30b 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -174,6 +174,7 @@
self.assertTrue(
any([job for job in definition
if job.endswith(('php55lint')) or
+ job.endswith(('php56lint')) or
job.startswith('mediawiki-extensions-') or
job.startswith(('composer-', 'mwgate-composer'))]),
'Project %s pipeline %s must have either '
@@ -337,8 +338,8 @@
# List of jobs allowed in check* pipelines
safe_jobs = [
- '(php5[35]|yaml)lint',
- '.*-(js|shell|php5[35]|)lint',
+ '(php5[56]|yaml)lint',
+ '.*-(js|shell|php5[56]|)lint',
'.*-(tabs|typos)',
'.*-whitespaces',
'noop',
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 49abcaa..8890c06 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2783,9 +2783,13 @@
- name: composer-test
- name: wikimedia/wikimania-scholarships
- template:
- - name: npm-docker
- - name: composer-test
+ check:
+ - php56lint
+ - composer-validate
+ test: &wikimania-scholarships-test
+ - npm-node-6-docker
+ - composer-php56-jessie
+ gate-and-submit: *wikimania-scholarships-test
- name: wikimedia/textcat
template:
--
To view, visit https://gerrit.wikimedia.org/r/404229
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If37202d169827c2f72d9c8adbabe6510185c9565
Gerrit-PatchSet: 4
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
