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

Change subject: Strip '-jessie' prefix from a Zuul template
......................................................................


Strip '-jessie' prefix from a Zuul template

Was transient for T161882

Change-Id: I21ca5a186675278e35bb9d94161fe7fec2ed84c1
---
M zuul/layout.yaml
1 file changed, 40 insertions(+), 61 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4c876c8..ab98f85 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -953,33 +953,12 @@
      - mwgate-php55lint
      - mwext-testextension-hhvm-composer-jessie
     php5:
-     - mwext-testextension-php55-composer-trusty
+     - mwext-testextension-php55-composer-jessie
     gate-and-submit: &extension-unittests-composer-gate-and-submit
      - mwgate-php55lint
-     - mwext-testextension-php55-composer-trusty
+     - mwext-testextension-php55-composer-jessie
      - mwext-testextension-hhvm-composer-jessie
     gate-and-submit-swat: *extension-unittests-composer-gate-and-submit
-    experimental:
-     - mwext-testextension-php55-composer-jessie
-     - mwext-qunit-composer-jessie
-     - mwgate-npm-node-6-jessie
-     - mwgate-composer-php70-jessie
-
-  # Saem but with php55-composer running on Jessie instead of Trusty
-  - name: extension-unittests-composer-jessie
-    check:
-     - mwgate-php55lint
-     - mwgate-composer-validate
-    test:
-     - mwgate-php55lint
-     - mwext-testextension-hhvm-composer-jessie
-    php5:
-     - mwext-testextension-php55-composer-jessie
-    gate-and-submit: &extension-unittests-composer-jessie-gate-and-submit
-     - mwgate-php55lint
-     - mwext-testextension-php55-composer-jessie
-     - mwext-testextension-hhvm-composer-jessie
-    gate-and-submit-swat: *extension-unittests-composer-jessie-gate-and-submit
     experimental:
      - mwext-qunit-composer-jessie
      - mwgate-npm-node-6-jessie
@@ -2648,7 +2627,7 @@
 
   - name: mediawiki/extensions/ArticlePlaceholder
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: extension-qunit-composer
       - name: mwgate-npm
     experimental:
@@ -3304,7 +3283,7 @@
 
   - name: mediawiki/extensions/GitHub
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/Gitweb
@@ -3384,7 +3363,7 @@
 
   - name: mediawiki/extensions/GoogleLogin
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/GoogleNewsSitemap
@@ -3808,7 +3787,7 @@
   - name: mediawiki/extensions/OAuthAuthentication
     template:
       - name: mwgate-npm
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
 
   - name: mediawiki/extensions/Offline
     template:
@@ -4091,7 +4070,7 @@
 
   - name: mediawiki/extensions/BlueSpiceEditNotifyConnector
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/BlueSpiceExtendedFilelist
@@ -4114,12 +4093,12 @@
 
   - name: mediawiki/extensions/BlueSpiceFoundation
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/BlueSpiceInsertTemplate
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/BlueSpiceMultiUpload
@@ -4133,17 +4112,17 @@
 
   - name: mediawiki/extensions/BlueSpicePageVersion
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/BSSMWConnector
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/BlueSpiceSignHere
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/BlueSpiceSMWConnector
@@ -4157,7 +4136,7 @@
 
   - name: mediawiki/extensions/Bootstrap
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/BreadCrumbs
@@ -4649,7 +4628,7 @@
 
   - name: mediawiki/extensions/LifeWeb
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/LifeWebCore
@@ -4878,7 +4857,7 @@
 
   - name: mediawiki/extensions/NSFileRepo
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/NukeDPL
@@ -5031,7 +5010,7 @@
 
   - name: mediawiki/extensions/PhpTagsSMW
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/PhpTagsSPARQL
@@ -5094,7 +5073,7 @@
 
   - name: mediawiki/extensions/PropertySuggester
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
       - name: extension-qunit-composer
 
@@ -5336,7 +5315,7 @@
 
   - name: mediawiki/extensions/SemanticHighcharts
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticRating
@@ -5346,7 +5325,7 @@
 
   - name: mediawiki/extensions/SemanticSifter
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticWebBrowser
@@ -5582,7 +5561,7 @@
 
   - name: mediawiki/extensions/TemplateStyles
     template:
-     - name: extension-unittests-composer-jessie
+     - name: extension-unittests-composer
      - name: mwgate-npm
 
   - name: mediawiki/extensions/TestLanguageNameGrammar
@@ -5612,7 +5591,7 @@
 
   - name: mediawiki/extensions/ThrottleOverride
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/ThumbParser
@@ -5849,7 +5828,7 @@
 
   - name: mediawiki/extensions/WikibaseLexeme
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
       - name: extension-qunit-composer
     test:
@@ -5859,7 +5838,7 @@
 
   - name: mediawiki/extensions/WikibaseQuality
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: extension-qunit-composer
       - name: mwgate-npm
     check:
@@ -5871,7 +5850,7 @@
 
   - name: mediawiki/extensions/WikibaseQualityConstraints
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: extension-qunit-composer
       - name: mwgate-npm
     check:
@@ -5883,7 +5862,7 @@
 
   - name: mediawiki/extensions/WikibaseQualityExternalValidation
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: extension-qunit-composer
       - name: mwgate-npm
     check:
@@ -5895,7 +5874,7 @@
 
   - name: mediawiki/extensions/WikibaseMediaInfo
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: extension-qunit-composer
       - name: mwgate-npm
     check:
@@ -6162,7 +6141,7 @@
 
   - name: mediawiki/extensions/reCaptcha
     template:
-     - name: extension-unittests-composer-jessie
+     - name: extension-unittests-composer
      - name: mwgate-npm
 
   - name: mediawiki/extensions/RecentActivityFeed
@@ -6225,17 +6204,17 @@
 
   - name: mediawiki/extensions/VIKI
     template:
-     - name: extension-unittests-composer-jessie
+     - name: extension-unittests-composer
      - name: mwgate-npm
 
   - name: mediawiki/extensions/VikiSemanticTitle
     template:
-     - name: extension-unittests-composer-jessie
+     - name: extension-unittests-composer
      - name: mwgate-npm
 
   - name: mediawiki/extensions/VikiTitleIcon
     template:
-     - name: extension-unittests-composer-jessie
+     - name: extension-unittests-composer
      - name: mwgate-npm
 
   - name: mediawiki/extensions/WebCache
@@ -6254,7 +6233,7 @@
 
   - name: mediawiki/extensions/XenForoAuth
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/XAnalytics
@@ -6540,7 +6519,7 @@
 
   - name: mediawiki/extensions/SemanticACL
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticBundle
@@ -6560,7 +6539,7 @@
 
   - name: mediawiki/extensions/SemanticGenealogy
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticImageAnnotator
@@ -6603,7 +6582,7 @@
 
   - name: mediawiki/extensions/SemanticTitle
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/SemanticUpdateOnPurge
@@ -6721,7 +6700,7 @@
 
   - name: mediawiki/extensions/SideBarMenu
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/SyntaxHighlight_GeSHi
@@ -6901,7 +6880,7 @@
 
   - name: mediawiki/extensions/WebPlatformAuth
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/WikiEditor
@@ -6913,7 +6892,7 @@
   - name: mediawiki/extensions/Wikibase
     template:
       - name: mwgate-npm
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: extension-qunit-composer
       - name: extension-phan-generic
       - name: mwgate-rake
@@ -6940,7 +6919,7 @@
   - name: mediawiki/extensions/WikibaseJavaScriptApi
     template:
       - name: extension-qunit-composer
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/Wikidata
@@ -6957,7 +6936,7 @@
   - name: mediawiki/extensions/Wikidata.org
     template:
       - name: extension-qunit-composer
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/WikiForum
@@ -6987,7 +6966,7 @@
 
   - name: mediawiki/extensions/WikimediaBadges
     template:
-      - name: extension-unittests-composer-jessie
+      - name: extension-unittests-composer
       - name: mwgate-npm
 
   - name: mediawiki/extensions/WikimediaEvents

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I21ca5a186675278e35bb9d94161fe7fec2ed84c1
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.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