jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/326020 )

Change subject: Create combined PHP5.5 and HHVM composer-test job
......................................................................


Create combined PHP5.5 and HHVM composer-test job

Bug: T142457
Change-Id: I2f52103a677b39dd2300a06ee014422b1d73ccac
---
M jjb/php.yaml
M zuul/layout.yaml
2 files changed, 28 insertions(+), 4 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/jjb/php.yaml b/jjb/php.yaml
index 553c920..5f6e605 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -163,6 +163,32 @@
     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 fdf54e4..3d6bb6a 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1164,12 +1164,10 @@
       - composer-validate
     test:
       - composer-php53
-      - composer-php55-trusty
-      - composer-hhvm-trusty
+      - composer-php55-hhvm-trusty
     gate-and-submit:
       - composer-php53
-      - composer-php55-trusty
-      - composer-hhvm-trusty
+      - composer-php55-hhvm-trusty
     experimental:
       - composer-php70-jessie
       - composer-hhvm-jessie

-- 
To view, visit https://gerrit.wikimedia.org/r/326020
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2f52103a677b39dd2300a06ee014422b1d73ccac
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to