jenkins-bot has submitted this change and it was merged.
Change subject: Create generic php-composer-test-{phpflavor}
......................................................................
Create generic php-composer-test-{phpflavor}
Change-Id: Ic64e4ee6aa721611790821dd47df2e6248a451db
---
M jjb/job-templates.yaml
M jjb/mediawiki-tools.yaml
M jjb/misc.yaml
M jjb/operations-mw-config.yaml
M zuul/layout.yaml
5 files changed, 32 insertions(+), 67 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 32e731a..e7a8c97 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -53,11 +53,11 @@
repository: '{repository}'
# Run composer update and composer test
-#
+# Intended for libraries that are published as composer packages
- job-template:
- name: '{name}-composer-{phpflavor}'
+ name: 'php-composer-test-{phpflavor}'
node: 'contintLabsSlave && (UbuntuPrecise && phpflavor-zend &&
phpflavor-{phpflavor}) || (UbuntuTrusty && phpflavor-hhvm &&
phpflavor-{phpflavor})'
- defaults: use-remoteonly-zuul
+ defaults: use-remote-zuul-shallow-clone
concurrent: true
triggers:
- zuul
@@ -67,6 +67,14 @@
- shell: |
/srv/deployment/integration/composer/vendor/bin/composer test
+- project:
+ name: 'php-composer-test-flavored'
+ jobs:
+ - 'php-composer-test-{phpflavor}':
+ phpflavor:
+ - hhvm
+ - zend
+
# Checks the committed composer.lock file against the database at
# https://github.com/FriendsOfPHP/security-advisories and the API
# provided by https://security.sensiolabs.org to see if any of them
diff --git a/jjb/mediawiki-tools.yaml b/jjb/mediawiki-tools.yaml
index ebb9fbe..5fa2751 100644
--- a/jjb/mediawiki-tools.yaml
+++ b/jjb/mediawiki-tools.yaml
@@ -5,14 +5,6 @@
- python-jobs
- project:
- name: 'mw-tools-codesniffer'
- phpflavor:
- - zend
- - hhvm
- jobs:
- - '{name}-composer-{phpflavor}'
-
-- project:
name: 'mw-tools-fluoride'
jobs:
diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 93438f6..edf50a0 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -59,7 +59,6 @@
jobs:
- '{name}-jslint'
- '{name}-npm'
- - '{name}-composer-{phpflavor}'
- '{name}-bundle-{bundlecommand}':
bundlecommand:
- rubocop
@@ -67,22 +66,6 @@
- 'oojs-ui-jsduck-publish'
- project:
- name: 'cdb'
- phpflavor:
- - zend
- - hhvm
- jobs:
- - '{name}-composer-{phpflavor}'
-
-- project:
name: 'citoid'
jobs:
- '{name}-npm'
-
-- project:
- name: 'utfnormal'
- phpflavor:
- - zend
- - hhvm
- jobs:
- - '{name}-composer-{phpflavor}'
diff --git a/jjb/operations-mw-config.yaml b/jjb/operations-mw-config.yaml
index d5bfce3..8b6fddb 100644
--- a/jjb/operations-mw-config.yaml
+++ b/jjb/operations-mw-config.yaml
@@ -16,9 +16,5 @@
- project:
name: 'operations-mw-config'
- phpflavor:
- - zend
- - hhvm
jobs:
- - '{name}-composer-{phpflavor}'
- operations-mw-config-tests
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 9236b8e..437c033 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1913,11 +1913,23 @@
- name: composer-test
check:
+ - phplint
- php-composer-validate
test:
- php-composer-test
gate-and-submit:
- php-composer-test
+
+ - name: composer-test-package
+ check:
+ - php-composer-package-validate
+ - phplint
+ test:
+ - php-composer-test-hhvm
+ - php-composer-test-zend
+ gate-and-submit:
+ - php-composer-test-hhvm
+ - php-composer-test-zend
- name: python
check-voter:
@@ -2453,15 +2465,8 @@
- phplint
- name: mediawiki/tools/codesniffer
- check:
- - phplint
- - php-composer-package-validate
- test:
- - mw-tools-codesniffer-composer-zend
- - mw-tools-codesniffer-composer-hhvm
- gate-and-submit:
- - mw-tools-codesniffer-composer-zend
- - mw-tools-codesniffer-composer-hhvm
+ template:
+ - name: composer-test-package
- name: mediawiki/tools/dippybird
check-voter:
@@ -2643,8 +2648,7 @@
- operations-mw-config-tests
- php-composer-validate
experimental:
- - operations-mw-config-composer-zend
- - operations-mw-config-composer-hhvm
+ - php-composer-test
postmerge:
- beta-mediawiki-config-update-eqiad
@@ -6191,26 +6195,12 @@
- phplint
- name: cdb
- check:
- - phplint
- - php-composer-package-validate
- test:
- - cdb-composer-hhvm
- - cdb-composer-zend
- gate-and-submit:
- - cdb-composer-hhvm
- - cdb-composer-zend
+ template:
+ - name: composer-test-package
- name: utfnormal
- check:
- - phplint
- - php-composer-package-validate
- test:
- - utfnormal-composer-hhvm
- # Zend is pretty slow so only test it on gate
- gate-and-submit:
- - utfnormal-composer-zend
- - utfnormal-composer-hhvm
+ template:
+ - name: composer-test-package
- name: sartoris
template:
@@ -6252,23 +6242,19 @@
- oojs-core-jsduck-publish
- name: oojs/ui
+ template:
+ - name: composer-test-package
check:
- oojs-ui-jslint
- - phplint
- oojs-ui-ruby2.0lint
- - php-composer-package-validate
test:
- oojs-ui-bundle-rubocop
- oojs-ui-npm
- - oojs-ui-composer-zend
- - oojs-ui-composer-hhvm
- jsduck
- oojs-ui-ruby2.0lint
gate-and-submit:
- oojs-ui-bundle-rubocop
- oojs-ui-npm
- - oojs-ui-composer-zend
- - oojs-ui-composer-hhvm
- jsduck
- oojs-ui-ruby2.0lint
postmerge:
--
To view, visit https://gerrit.wikimedia.org/r/195072
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic64e4ee6aa721611790821dd47df2e6248a451db
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Hashar <[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
