jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/326032 )
Change subject: Revert "Create combined PHP5.5 and HHVM composer-test job"
......................................................................
Revert "Create combined PHP5.5 and HHVM composer-test job"
Didn't work. set-phpflavor hhvm failed...
This reverts commit ec7c5c49af5c5f59c793269a4291f02d500b4978.
Change-Id: Ia434d94d8d92604235241eb3edc994a178563b30
---
M jjb/php.yaml
M zuul/layout.yaml
2 files changed, 4 insertions(+), 28 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/php.yaml b/jjb/php.yaml
index 5f6e605..553c920 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -163,32 +163,6 @@
triggers:
- zuul
-# Runs "composer update" and "composer test" but on disposable instances
-# maintained by Nodepool. It runs both PHP55 and HHVM tests in the same job.
-- job:
- name: 'composer-php55-hhvm-trusty'
- node: ci-trusty-wikimedia
- defaults: use-remote-zuul-shallow-clone
- concurrent: true
- properties:
- - build-discarder:
- days-to-keep: 15
- triggers:
- - zuul
- builders:
- - castor-load
- - set-phpflavor:
- phpflavor: php55
- - composer-validate:
- dir: '.'
- - composer-update:
- dir: '.'
- - composer-test
- - set-phpflavor:
- phpflavor: hhvm
- - composer-test
- publishers:
- - castor-save
- project:
name: 'composer-flavored-on-nodepool'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3d6bb6a..fdf54e4 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1164,10 +1164,12 @@
- composer-validate
test:
- composer-php53
- - composer-php55-hhvm-trusty
+ - composer-php55-trusty
+ - composer-hhvm-trusty
gate-and-submit:
- composer-php53
- - composer-php55-hhvm-trusty
+ - composer-php55-trusty
+ - composer-hhvm-trusty
experimental:
- composer-php70-jessie
- composer-hhvm-jessie
--
To view, visit https://gerrit.wikimedia.org/r/326032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia434d94d8d92604235241eb3edc994a178563b30
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[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
