jenkins-bot has submitted this change and it was merged.

Change subject: Merge mwext-Wikibase-* repo and repo-api jobs
......................................................................


Merge mwext-Wikibase-* repo and repo-api jobs

Change-Id: I7ac55f413abf9879d8ccf1a4fb7186d4e0636e09
---
M jjb/wikidata.yaml
M zuul/layout.yaml
2 files changed, 1 insertion(+), 23 deletions(-)

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



diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index 2cdee07..c86a1cb 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -174,21 +174,7 @@
         phpflavor:
           - zend
           - hhvm
-        phpunit-params: '--group Wikibase --exclude-group WikibaseAPI'
-
-     - 'mwext-Wikibase-{kind}-tests-{dbflavor}-{phpflavor}':
-        ext-name: 'Wikibase'
-        kind: repo-api
-        repoorclient: 'repo'
-        dependencies: 'cldr'
-        dbflavor:
-          - mysql
-          - sqlite
-        phpflavor:
-          - zend
-          - hhvm
-        phpunit-params: '--group WikibaseAPI,Purtle'
-
+        phpunit-params: '--group Wikibase,WikibaseAPI,Purtle'
      - 'mwext-Wikibase-{kind}-tests-{dbflavor}-{phpflavor}':
         ext-name: 'Wikibase'
         kind: client
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 7a92c31..0c22d1d 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6787,10 +6787,6 @@
       - 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
@@ -6804,10 +6800,6 @@
       - 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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ac55f413abf9879d8ccf1a4fb7186d4e0636e09
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
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