jenkins-bot has submitted this change and it was merged.
Change subject: phpunit-coverage-publish to Nodepool
......................................................................
phpunit-coverage-publish to Nodepool
Migrate job to Trusty instances on Nodepool.
Expand the JJB macro directly in the job since that is the sole user.
Bug: T119140
Change-Id: Ie49b426b44f303d266cdbaee66dff3bca3debe89
---
M jjb/macro.yaml
M jjb/misc.yaml
2 files changed, 8 insertions(+), 17 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 2c23b6b..6b6e1e5 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -115,19 +115,6 @@
rm -rf doc/html
doxygen
-# Intended for use in jobs that use composer-update
-#
-# MUST run 'global-setup' before this
-- builder:
- name: phpunit-coverage
- builders:
- # Use php5 instead of php (hhvm) because it doesn't do coverage
- # as well as php5-xdebug. And also slow.
- - shell: |
- . /srv/deployment/integration/slave-scripts/bin/global-set-env.sh
- rm -rf coverage
- php5 ./vendor/bin/phpunit --coverage-html coverage/
-
# ALWAYS pair with 'global-teardown'
- builder:
name: global-setup
diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index af5aca0..476e78c 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -20,21 +20,25 @@
- job:
name: 'phpunit-coverage-publish'
- node: contintLabsSlave && UbuntuTrusty
+ node: ci-trusty-wikimedia
defaults: use-remote-zuul-shallow-clone
concurrent: false
triggers:
- zuul
builders:
- - global-setup
+ - castor-load
- composer-update:
dir: '.'
- - phpunit-coverage
+ # Use php5 instead of php (hhvm) because it doesn't do coverage as well as
+ # php5-xdebug. And also slow.
+ - shell: |
+ rm -rf coverage
+ php5 ./vendor/bin/phpunit --coverage-html coverage/
- cover-publish:
src: 'coverage'
dest: '$DOC_PROJECT'
publishers:
- - global-teardown
+ - castor-save
- job:
name: 'unicodejs-publish'
--
To view, visit https://gerrit.wikimedia.org/r/317830
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie49b426b44f303d266cdbaee66dff3bca3debe89
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
