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

Change subject: Rename WikidataQuality repos to WikibaseQuality repos.
......................................................................


Rename WikidataQuality repos to WikibaseQuality repos.

Remove duplicate jshint job, it already is run during npm.
Remove duplicate trigger for npm job.

Change-Id: I4677df5b3d16f5379e1cb6ae8ec00413a3d551f7
---
M jjb/wikidata.yaml
M zuul/layout.yaml
2 files changed, 58 insertions(+), 63 deletions(-)

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



diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index a9f6948..35ecdfa 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -195,7 +195,7 @@
       - wikidata-query-rdf
 
 - project:
-    name: WikidataQuality
+    name: WikibaseQuality
     # By default we do not need any other extensions:
     dependencies: ""
 
@@ -209,7 +209,7 @@
     jobs:
 
      - 'mwext-{ext-name}-{kind}-tests-{dbflavor}-{phpflavor}':
-        ext-name: 'WikidataQuality'
+        ext-name: 'WikibaseQuality'
         kind: repo
         repoorclient: 'repo'
         dependencies: 'Wikibase'
@@ -219,14 +219,14 @@
         phpflavor:
           - zend
           - hhvm
-        phpunit-params: '--group WikibaseQuality,WikidataQuality'
+        phpunit-params: '--group WikibaseQuality'
 
      - 'mwext-{ext-name}-qunit':
-        ext-name: 'WikidataQuality'
+        ext-name: 'WikibaseQuality'
         dependencies: 'Wikibase'
 
 - project:
-    name: WikidataQualityConstraints
+    name: WikibaseQualityConstraints
     # By default we do not need any other extensions:
     dependencies: ""
 
@@ -239,29 +239,25 @@
 
     jobs:
 
-     - '{name}-{ext-name}-npm':
-        name: 'mwext'
-        ext-name: 'WikidataQualityConstraints'
-
      - 'mwext-{ext-name}-{kind}-tests-{dbflavor}-{phpflavor}':
-        ext-name: 'WikidataQualityConstraints'
+        ext-name: 'WikibaseQualityConstraints'
         kind: repo
         repoorclient: 'repo'
-        dependencies: 'Wikibase WikidataQuality'
+        dependencies: 'Wikibase WikibaseQuality'
         dbflavor:
           - mysql
           - sqlite
         phpflavor:
           - zend
           - hhvm
-        phpunit-params: '--group WikidataQuality'
+        phpunit-params: '--group WikibaseQuality'
 
      - 'mwext-{ext-name}-qunit':
-        ext-name: 'WikidataQualityConstraints'
-        dependencies: 'Wikibase WikidataQuality'
+        ext-name: 'WikibaseQualityConstraints'
+        dependencies: 'Wikibase WikibaseQuality'
 
 - project:
-    name: WikidataQualityExternalValidation
+    name: WikibaseQualityExternalValidation
     # By default we do not need any other extensions:
     dependencies: ""
 
@@ -274,24 +270,19 @@
 
     jobs:
 
-     - '{name}-{ext-name}-npm':
-        name: 'mwext'
-        ext-name: 'WikidataQualityExternalValidation'
-
      - 'mwext-{ext-name}-{kind}-tests-{dbflavor}-{phpflavor}':
-        ext-name: 'WikidataQualityExternalValidation'
+        ext-name: 'WikibaseQualityExternalValidation'
         kind: repo
         repoorclient: 'repo'
-        dependencies: 'Wikibase WikidataQuality'
+        dependencies: 'Wikibase WikibaseQuality'
         dbflavor:
           - mysql
           - sqlite
         phpflavor:
           - zend
           - hhvm
-        phpunit-params: '--group WikidataQuality'
+        phpunit-params: '--group WikibaseQuality'
 
      - 'mwext-{ext-name}-qunit':
-        ext-name: 'WikidataQualityExternalValidation'
-        dependencies: 'Wikibase WikidataQuality'
-
+        ext-name: 'WikibaseQualityExternalValidation'
+        dependencies: 'Wikibase WikibaseQuality'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5a89b61..ba0f310 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5780,82 +5780,86 @@
       - name: extension-unittests-generic
       - name: npm
 
-  - name: mediawiki/extensions/WikidataQuality
+  - name: mediawiki/extensions/WikibaseQuality
     template:
-      - name: lint-js
       - name: npm
     check:
+      - jsonlint
       - phplint
       - php-composer-package-validate
     test:
+      - jsonlint
       - phplint
       - php-composer-package-validate
-      - mwext-WikidataQuality-repo-tests-sqlite-hhvm
-      - mwext-WikidataQuality-repo-tests-mysql-hhvm
-      - mwext-WikidataQuality-qunit
+      - mwext-WikibaseQuality-repo-tests-sqlite-hhvm
+      - mwext-WikibaseQuality-repo-tests-mysql-hhvm
+      - mwext-WikibaseQuality-qunit
     zend:
-      - mwext-WikidataQuality-repo-tests-sqlite-zend
-      - mwext-WikidataQuality-repo-tests-mysql-zend
+      - mwext-WikibaseQuality-repo-tests-sqlite-zend
+      - mwext-WikibaseQuality-repo-tests-mysql-zend
     gate-and-submit:
+      - jsonlint
       - phplint
       - php-composer-package-validate
-      - mwext-WikidataQuality-repo-tests-sqlite-zend
-      - mwext-WikidataQuality-repo-tests-mysql-zend
-      - mwext-WikidataQuality-repo-tests-sqlite-hhvm
-      - mwext-WikidataQuality-repo-tests-mysql-hhvm
-      - mwext-WikidataQuality-qunit
+      - mwext-WikibaseQuality-repo-tests-sqlite-zend
+      - mwext-WikibaseQuality-repo-tests-mysql-zend
+      - mwext-WikibaseQuality-repo-tests-sqlite-hhvm
+      - mwext-WikibaseQuality-repo-tests-mysql-hhvm
+      - mwext-WikibaseQuality-qunit
 
-  - name: mediawiki/extensions/WikidataQualityConstraints
+  - name: mediawiki/extensions/WikibaseQualityConstraints
     template:
-      - name: lint-js
       - name: npm
     check:
+      - jsonlint
       - phplint
       - php-composer-package-validate
     test:
+      - jsonlint
       - phplint
       - php-composer-package-validate
-      - mwext-WikidataQualityConstraints-repo-tests-sqlite-hhvm
-      - mwext-WikidataQualityConstraints-repo-tests-mysql-hhvm
-      - mwext-WikidataQualityConstraints-qunit
+      - mwext-WikibaseQualityConstraints-repo-tests-sqlite-hhvm
+      - mwext-WikibaseQualityConstraints-repo-tests-mysql-hhvm
+      - mwext-WikibaseQualityConstraints-qunit
     zend:
-      - mwext-WikidataQualityConstraints-repo-tests-sqlite-zend
-      - mwext-WikidataQualityConstraints-repo-tests-mysql-zend
+      - mwext-WikibaseQualityConstraints-repo-tests-sqlite-zend
+      - mwext-WikibaseQualityConstraints-repo-tests-mysql-zend
     gate-and-submit:
+      - jsonlint
       - phplint
       - php-composer-package-validate
-      - mwext-WikidataQualityConstraints-repo-tests-sqlite-zend
-      - mwext-WikidataQualityConstraints-repo-tests-mysql-zend
-      - mwext-WikidataQualityConstraints-repo-tests-sqlite-hhvm
-      - mwext-WikidataQualityConstraints-repo-tests-mysql-hhvm
-      - mwext-WikidataQualityConstraints-qunit
+      - mwext-WikibaseQualityConstraints-repo-tests-sqlite-zend
+      - mwext-WikibaseQualityConstraints-repo-tests-mysql-zend
+      - mwext-WikibaseQualityConstraints-repo-tests-sqlite-hhvm
+      - mwext-WikibaseQualityConstraints-repo-tests-mysql-hhvm
+      - mwext-WikibaseQualityConstraints-qunit
 
-  - name: mediawiki/extensions/WikidataQualityExternalValidation
+  - name: mediawiki/extensions/WikibaseQualityExternalValidation
     template:
-      - name: lint-js
       - name: npm
     check:
+      - jsonlint
       - phplint
       - php-composer-package-validate
     test:
+      - jsonlint
       - phplint
       - php-composer-package-validate
-      - mwext-WikidataQualityExternalValidation-repo-tests-sqlite-hhvm
-      - mwext-WikidataQualityExternalValidation-repo-tests-mysql-hhvm
-      - mwext-WikidataQualityExternalValidation-qunit
-      - mwext-WikidataQualityExternalValidation-npm
+      - mwext-WikibaseQualityExternalValidation-repo-tests-sqlite-hhvm
+      - mwext-WikibaseQualityExternalValidation-repo-tests-mysql-hhvm
+      - mwext-WikibaseQualityExternalValidation-qunit
     zend:
-      - mwext-WikidataQualityExternalValidation-repo-tests-sqlite-zend
-      - mwext-WikidataQualityExternalValidation-repo-tests-mysql-zend
+      - mwext-WikibaseQualityExternalValidation-repo-tests-sqlite-zend
+      - mwext-WikibaseQualityExternalValidation-repo-tests-mysql-zend
     gate-and-submit:
+      - jsonlint
       - phplint
       - php-composer-package-validate
-      - mwext-WikidataQualityExternalValidation-repo-tests-sqlite-zend
-      - mwext-WikidataQualityExternalValidation-repo-tests-mysql-zend
-      - mwext-WikidataQualityExternalValidation-repo-tests-sqlite-hhvm
-      - mwext-WikidataQualityExternalValidation-repo-tests-mysql-hhvm
-      - mwext-WikidataQualityExternalValidation-qunit
-      - mwext-WikidataQualityExternalValidation-npm
+      - mwext-WikibaseQualityExternalValidation-repo-tests-sqlite-zend
+      - mwext-WikibaseQualityExternalValidation-repo-tests-mysql-zend
+      - mwext-WikibaseQualityExternalValidation-repo-tests-sqlite-hhvm
+      - mwext-WikibaseQualityExternalValidation-repo-tests-mysql-hhvm
+      - mwext-WikibaseQualityExternalValidation-qunit
 
   - name: mediawiki/extensions/Wikilog
     template:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4677df5b3d16f5379e1cb6ae8ec00413a3d551f7
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de>
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