Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/291506
Change subject: Migrate composer-package-validate to trusty nodepool
......................................................................
Migrate composer-package-validate to trusty nodepool
Change-Id: I13f8dbb40471098c8fadc9da1762864680df4a3b
---
M jjb/php.yaml
M tests/test_zuul_scheduler.py
M zuul/layout.yaml
M zuul/parameter_functions.py
4 files changed, 29 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/06/291506/1
diff --git a/jjb/php.yaml b/jjb/php.yaml
index f1356fb..b4aeecb 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -33,17 +33,21 @@
# Job for libraries that are published as composer packages.
# Includes full validation that packagist.org requires.
- job:
- name: composer-package-validate
- node: contintLabsSlave && UbuntuTrusty
+ name: composer-package-validate-trusty
+ node: ci-trusty-wikimedia
defaults: use-remote-zuul-shallow-clone
concurrent: true
-
+ properties:
+ - zeromq-event
triggers:
- zuul
builders:
+ - castor-load
- composer-validate-package
logrotate:
daysToKeep: 15
+ publishers:
+ - castor-save
# Job for anything with a composer.json, but *isn't* going to be
# published on packagist.org.
diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index b9b643a..fa41982 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -299,7 +299,7 @@
'.*-whitespaces',
'noop',
'composer-validate',
- 'composer-package-validate',
+ 'composer-package-validate-trusty',
'fail-archived-repositories',
'tox-jessie',
]
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3989181..82bce39 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -647,7 +647,7 @@
files:
- '^composer.json$'
- - name: ^composer-package-validate$
+ - name: ^composer-package-validate-trusty$
files:
- '^composer.json$'
@@ -1135,7 +1135,7 @@
- name: composer-test-package
check:
- - composer-package-validate
+ - composer-package-validate-trusty
- php53lint
- php55lint
test:
@@ -1151,7 +1151,7 @@
- name: composer-test-package55
check:
- - composer-package-validate
+ - composer-package-validate-trusty
- php55lint
test:
#- composer-package-hhvm-jessie
@@ -1275,7 +1275,7 @@
check:
- mediawiki-core-php53lint
- mediawiki-core-php55lint
- - composer-package-validate
+ - composer-package-validate-trusty
test:
- mediawiki-core-phpcs-trusty
- mediawiki-core-jsduck
@@ -1285,7 +1285,7 @@
- mediawiki-phpunit-hhvm-trusty
- mediawiki-parsertests-hhvm-trusty
- mediawiki-core-qunit
- - composer-package-validate
+ - composer-package-validate-trusty
php5:
# Comment "check php5" to manually run this
- mediawiki-phpunit-php55-trusty
@@ -1306,7 +1306,7 @@
- mediawiki-phpunit-php55-trusty
- mediawiki-parsertests-php55-trusty
- mediawiki-core-qunit
- - composer-package-validate
+ - composer-package-validate-trusty
postmerge:
- mediawiki-core-jsduck-publish
- mediawiki-core-doxygen-publish
@@ -6296,11 +6296,11 @@
- name: jsonlint
- name: npm
check:
- - composer-package-validate
+ - composer-package-validate-trusty
test:
- - composer-package-validate
+ - composer-package-validate-trusty
gate-and-submit:
- - composer-package-validate
+ - composer-package-validate-trusty
- name: mediawiki/extensions/WikibaseQualityConstraints
template:
@@ -6309,11 +6309,11 @@
- name: jsonlint
- name: npm
check:
- - composer-package-validate
+ - composer-package-validate-trusty
test:
- - composer-package-validate
+ - composer-package-validate-trusty
gate-and-submit:
- - composer-package-validate
+ - composer-package-validate-trusty
- name: mediawiki/extensions/WikibaseQualityExternalValidation
template:
@@ -6322,11 +6322,11 @@
- name: jsonlint
- name: npm
check:
- - composer-package-validate
+ - composer-package-validate-trusty
test:
- - composer-package-validate
+ - composer-package-validate-trusty
gate-and-submit:
- - composer-package-validate
+ - composer-package-validate-trusty
- name: mediawiki/extensions/WikibaseMediaInfo
template:
@@ -6335,11 +6335,11 @@
- name: extension-qunit-composer
- name: npm
check:
- - composer-package-validate
+ - composer-package-validate-trusty
test:
- - composer-package-validate
+ - composer-package-validate-trusty
gate-and-submit:
- - composer-package-validate
+ - composer-package-validate-trusty
experimental:
- mwext-mw-selenium-composer
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 6f356d1..432f426 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -35,6 +35,9 @@
# T128091: oojs/ui npm job runs on Jessie which only has HHVM
params['PHP_BIN'] = 'hhvm'
+ if job.name.endswith('composer-package-validate-trusty'):
+ params['PHP_BIN'] = 'php5'
+
ext_deps_jobs = ('mwext-testextension', 'mwext-qunit', 'mwext-mw-selenium')
if job.name.startswith(ext_deps_jobs):
set_ext_dependencies(item, job, params)
--
To view, visit https://gerrit.wikimedia.org/r/291506
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I13f8dbb40471098c8fadc9da1762864680df4a3b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
