jenkins-bot has submitted this change and it was merged.
Change subject: Set up php55lint jobs, adapt phplint macro for $PHP_BIN (re-do)
......................................................................
Set up php55lint jobs, adapt phplint macro for $PHP_BIN (re-do)
This creates php55lint jobs, as well as adding them to the Zuul layout
as all current MediaWiki code should be both PHP5.3 and PHP5.5
compatible.
Change-Id: Ife2b8c76925d1ef7f39c468bd0637a26364bd618
---
M jjb/job-templates.yaml
M jjb/macro.yaml
M jjb/mediawiki.yaml
M tests/test_zuul_scheduler.py
M zuul/layout.yaml
5 files changed, 52 insertions(+), 3 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 3cf3046..041ff35 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -290,6 +290,16 @@
builders:
- phplint
+- job:
+ name: 'php55lint'
+ node: contintLabsSlave && phpflavor-php55
+ defaults: use-remote-zuul-shallow-clone
+ concurrent: true
+ triggers:
+ - zuul
+ builders:
+ - phplint
+
# Deprecated non-generic phplint job. You should
# use the above 'phplint' job. Due to a performance issue
# with Git on Ubuntu Precise (details on T92042), this is
@@ -307,6 +317,18 @@
builders:
- phplint
+- job-template:
+ name: '{name}-php55lint'
+ node: contintLabsSlave && phpflavor-php55
+ defaults: use-remote-zuul-no-submodules
+ concurrent: true
+ properties:
+ - throttle-one-per-node
+ triggers:
+ - zuul
+ builders:
+ - phplint
+
- job:
name: 'phpunit'
node: contintLabsSlave && UbuntuPrecise
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index bbf87f8..74ae7f1 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -533,8 +533,10 @@
name: phplint
builders:
- shell: |
+ . /srv/deployment/integration/slave-scripts/bin/global-set-env.sh
+ $PHP_BIN -v
/srv/deployment/integration/slave-scripts/bin/git-changed-in-head php
php5 inc phtml module install \
- | xargs -n1 -t php -l
+ | xargs -n1 -t $PHP_BIN -l
- builder:
name: tox
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index af3737a..3e76de1 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -371,6 +371,7 @@
- 'mediawiki-core-doxygen-publish'
- mediawiki-gate
- '{name}-php53lint'
+ - '{name}-php55lint'
- 'mediawiki-phpunit-{phpflavor}'
- 'mediawiki-phpunit-parsertests-{phpflavor}'
- 'mediawiki-phpunit-{phpflavor}-composer'
diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index aff7fd7..0db7c17 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -265,9 +265,9 @@
actual = {}
# List of jobs allowed in check* pipelines
safe_jobs = [
- '(php53|perl|json|yaml)lint',
+ '(php5[35]|perl|json|yaml)lint',
'jshint',
- '.*-(js|perl|shell|php53|)lint',
+ '.*-(js|perl|shell|php5[35]|)lint',
'(pp|erb)lint-HEAD',
'.*-(tabs|typos)',
'operations-puppet-pep8',
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index f5d1938..da9618e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1184,9 +1184,11 @@
- name: extension-unittests
check:
- php53lint
+ - php55lint
- php-composer-validate
test:
- php53lint
+ - php55lint
# Extensions tests with core+vendor
#- 'mwext-{name}-testextension-hhvm'
- 'mwext-{name}-testextension-php53'
@@ -1194,6 +1196,7 @@
gate-and-submit:
- mediawiki-gate
- php53lint
+ - php55lint
# Extensions tests with core+vendor
#- 'mwext-{name}-testextension-hhvm'
- 'mwext-{name}-testextension-php53'
@@ -1211,15 +1214,18 @@
- name: extension-unittests-composer
check:
- php53lint
+ - php55lint
- php-composer-validate
test:
- php53lint
+ - php55lint
- mwext-testextension-php53-composer
- mwext-testextension-hhvm-composer
- php-composer-validate
gate-and-submit:
- mediawiki-gate
- php53lint
+ - php55lint
- mwext-testextension-php53-composer
- mwext-testextension-hhvm-composer
- php-composer-validate
@@ -1231,15 +1237,18 @@
- name: extension-unittests-generic
check:
- php53lint
+ - php55lint
- php-composer-validate
test:
- php53lint
+ - php55lint
# Extensions tests with core+vendor
- mwext-testextension-php53
- php-composer-validate
gate-and-submit:
- mediawiki-gate
- php53lint
+ - php55lint
# Extensions tests with core+vendor
- mwext-testextension-php53
- php-composer-validate
@@ -1304,11 +1313,13 @@
check-only:
- 'mwext-{name}-jslint'
- php53lint
+ - php55lint
- php-composer-validate
gate-and-submit:
- mediawiki-gate
- 'mwext-{name}-jslint'
- php53lint
+ - php55lint
- php-composer-validate
- name: jsduck
@@ -1321,11 +1332,13 @@
- name: mw-checks
check-voter:
- php53lint
+ - php55lint
- jsonlint
- php-composer-validate
gate-and-submit:
- mediawiki-gate
- php53lint
+ - php55lint
- jsonlint
- php-composer-validate
experimental:
@@ -1340,15 +1353,18 @@
- name: mw-checks-test
check:
- php53lint
+ - php55lint
- jsonlint
- php-composer-validate
test:
- php53lint
+ - php55lint
- jsonlint
- php-composer-validate
gate-and-submit:
- mediawiki-gate
- php53lint
+ - php55lint
- jsonlint
- php-composer-validate
experimental:
@@ -1362,6 +1378,7 @@
- name: composer-test
check:
- php53lint
+ - php55lint
- php-composer-validate
test:
- php-composer-test
@@ -1388,6 +1405,7 @@
check:
- php-composer-package-validate
- php53lint
+ - php55lint
test:
- php-composer-test-hhvm
- php-composer-test-php53
@@ -1504,12 +1522,14 @@
check:
- mediawiki-core-jslint
- mediawiki-core-php53lint
+ - mediawiki-core-php55lint
- php-composer-package-validate
test:
- mediawiki-core-phpcs
- mediawiki-core-jsduck
- mediawiki-core-npm
- mediawiki-core-php53lint
+ - mediawiki-core-php55lint
- mediawiki-phpunit-hhvm
- mediawiki-phpunit-parsertests-hhvm
#- mediawiki-phpunit-php53 (disabled, slow, Icac172b16)
@@ -1524,6 +1544,7 @@
- mediawiki-core-jsduck
- mediawiki-core-npm
- mediawiki-core-php53lint
+ - mediawiki-core-php55lint
- mediawiki-core-phpcs
- mediawiki-phpunit-hhvm
- mediawiki-phpunit-parsertests-hhvm
@@ -1555,9 +1576,11 @@
- name: extension-gate
check:
- php53lint
+ - php55lint
- php-composer-validate
test:
- php53lint
+ - php55lint
- php-composer-validate
- mediawiki-core-qunit
- mediawiki-phpunit-hhvm
@@ -1567,6 +1590,7 @@
- mediawiki-phpunit-parsertests-php53
gate-and-submit:
- php53lint
+ - php55lint
- mediawiki-phpunit-hhvm
- mediawiki-phpunit-parsertests-hhvm
- mediawiki-phpunit-php53
--
To view, visit https://gerrit.wikimedia.org/r/268047
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ife2b8c76925d1ef7f39c468bd0637a26364bd618
Gerrit-PatchSet: 4
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
