Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268047
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)
Change-Id: Ife2b8c76925d1ef7f39c468bd0637a26364bd618
---
M jjb/job-templates.yaml
M jjb/macro.yaml
M jjb/mediawiki.yaml
3 files changed, 26 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/47/268047/1
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 72901c3..b33b075 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'
--
To view, visit https://gerrit.wikimedia.org/r/268047
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife2b8c76925d1ef7f39c468bd0637a26364bd618
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
