Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/202289

Change subject: Run mwext-Wikibase phpunit jobs on HHVM too
......................................................................

Run mwext-Wikibase phpunit jobs on HHVM too

Bug: T95230
Change-Id: Iffd59c6ee69ad22f7e4efcaadb20d60dfa177e6b
---
M jjb/wikidata.yaml
M zuul/layout.yaml
2 files changed, 41 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/89/202289/1

diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index 5dd2531..ea97cfc 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -26,12 +26,15 @@
                {params}
 
 - job-template:
-    name: 'mwext-Wikibase-{kind}-tests-{dbflavor}'
-    node: contintLabsSlave && UbuntuPrecise
+    name: 'mwext-Wikibase-{kind}-tests-{dbflavor}-{phpflavor}'
+    node: 'contintLabsSlave && ((UbuntuPrecise && phpflavor-zend && 
phpflavor-{phpflavor}) || (UbuntuTrusty && phpflavor-hhvm && 
phpflavor-{phpflavor}))'
     concurrent: true
     triggers:
      - zuul
     builders:
+     - assert-phpflavor:
+         phpflavor: '{phpflavor}'
+     - hhvm-clear-hhbc
      - zuul-cloner-extdeps:
          ext-name: 'Wikibase'
          dependencies: '{dependencies}'
@@ -142,7 +145,7 @@
         name: 'mwext'
         ext-name: 'Wikibase'
 
-     - 'mwext-Wikibase-{kind}-tests-{dbflavor}':
+     - 'mwext-Wikibase-{kind}-tests-{dbflavor}-{phpflavor}':
         ext-name: 'Wikibase'
         kind: repo
         repoorclient: 'repo'
@@ -150,9 +153,12 @@
         dbflavor:
           - mysql
           - sqlite
+        phpflavor:
+          - zend
+          - hhvm
         phpunit-params: '--group Wikibase --exclude-group WikibaseAPI'
 
-     - 'mwext-Wikibase-{kind}-tests-{dbflavor}':
+     - 'mwext-Wikibase-{kind}-tests-{dbflavor}-{phpflavor}':
         ext-name: 'Wikibase'
         kind: repo-api
         repoorclient: 'repo'
@@ -160,9 +166,12 @@
         dbflavor:
           - mysql
           - sqlite
+        phpflavor:
+          - zend
+          - hhvm
         phpunit-params: '--group WikibaseAPI,Purtle'
 
-     - 'mwext-Wikibase-{kind}-tests-{dbflavor}':
+     - 'mwext-Wikibase-{kind}-tests-{dbflavor}-{phpflavor}':
         ext-name: 'Wikibase'
         kind: client
         repoorclient: 'client'
@@ -170,6 +179,9 @@
         dbflavor:
           - mysql
           - sqlite
+        phpflavor:
+          - zend
+          - hhvm
         phpunit-params: '--group Wikibase,WikibaseClient'
 
      - 'mwext-Wikibase-qunit':
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index a38053c..8a0286e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6864,23 +6864,35 @@
     test:
       - phplint
       - php-composer-validate
-      - mwext-Wikibase-repo-tests-mysql
-      - mwext-Wikibase-repo-tests-sqlite
-      - mwext-Wikibase-repo-api-tests-mysql
-      - mwext-Wikibase-repo-api-tests-sqlite
-      - mwext-Wikibase-client-tests-mysql
-      - mwext-Wikibase-client-tests-sqlite
+      - mwext-Wikibase-repo-tests-mysql-zend
+      - mwext-Wikibase-repo-tests-sqlite-zend
+      - mwext-Wikibase-repo-tests-mysql-hhvm
+      - mwext-Wikibase-repo-tests-sqlite-hhvm
+      - mwext-Wikibase-repo-api-tests-mysql-zend
+      - mwext-Wikibase-repo-api-tests-sqlite-zend
+      - mwext-Wikibase-repo-api-tests-mysql-hhvm
+      - mwext-Wikibase-repo-api-tests-sqlite-hhvm
+      - mwext-Wikibase-client-tests-mysql-zend
+      - mwext-Wikibase-client-tests-sqlite-zend
+      - mwext-Wikibase-client-tests-mysql-hhvm
+      - mwext-Wikibase-client-tests-sqlite-hhvm
       - mwext-Wikibase-qunit
       - mwext-Wikibase-npm
     gate-and-submit:
       - phplint
       - php-composer-validate
-      - mwext-Wikibase-repo-tests-mysql
-      - mwext-Wikibase-repo-tests-sqlite
-      - mwext-Wikibase-repo-api-tests-mysql
-      - mwext-Wikibase-repo-api-tests-sqlite
-      - mwext-Wikibase-client-tests-mysql
-      - mwext-Wikibase-client-tests-sqlite
+      - mwext-Wikibase-repo-tests-mysql-zend
+      - mwext-Wikibase-repo-tests-sqlite-zend
+      - mwext-Wikibase-repo-tests-mysql-hhvm
+      - mwext-Wikibase-repo-tests-sqlite-hhvm
+      - mwext-Wikibase-repo-api-tests-mysql-zend
+      - mwext-Wikibase-repo-api-tests-sqlite-zend
+      - mwext-Wikibase-repo-api-tests-mysql-hhvm
+      - mwext-Wikibase-repo-api-tests-sqlite-hhvm
+      - mwext-Wikibase-client-tests-mysql-zend
+      - mwext-Wikibase-client-tests-sqlite-zend
+      - mwext-Wikibase-client-tests-mysql-hhvm
+      - mwext-Wikibase-client-tests-sqlite-hhvm
       - mwext-Wikibase-qunit
       - mwext-Wikibase-npm
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffd59c6ee69ad22f7e4efcaadb20d60dfa177e6b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to