Paladox has uploaded a new change for review.

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

Change subject: Update SyntaxHighlight_GeSHi tests
......................................................................

Update SyntaxHighlight_GeSHi tests

Remove unused mwext-SyntaxHighlight_GeSHi-phpcs-HEAD

Change-Id: I81cc5b3f16caac835111fe6da332cdf0f3625f12
---
M tests/test_zuul_layout.py
M zuul/layout.yaml
2 files changed, 10 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/35/225035/1

diff --git a/tests/test_zuul_layout.py b/tests/test_zuul_layout.py
index 804cd2b..ea44948 100644
--- a/tests/test_zuul_layout.py
+++ b/tests/test_zuul_layout.py
@@ -130,11 +130,16 @@
             ],
         }
 
+        # Pre compile above regular expressions
+        repos_compiled = {}
+        for (regex, assertions) in repos.iteritems():
+            repos_compiled[re.compile(regex)] = assertions
+        del repos
+
         for pipeline in self.getPipelines():
-            for regex, assertions in repos.items():
-                regex_comp = re.compile(regex)
+            for regex_compiled, assertions in repos_compiled.items():
                 for name in self.getPipelineProjectsNames(pipeline.name):
-                    if regex_comp.match(name):
+                    if regex_compiled.match(name):
                         project_def = self.getProjectDef(name)
 
                         requirements = set()
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5c6b0ab..414816d 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -651,8 +651,6 @@
     voting: false
   - name: mwext-Sentry-phpcs-HEAD
     voting: false
-  - name: mwext-SyntaxHighlight_GeSHi-phpcs-HEAD
-    voting: false
   - name: mwext-UploadWizard-phpcs-HEAD
     voting: false
   - name: mwext-Vector-phpcs-HEAD
@@ -7045,11 +7043,11 @@
 
   - name: mediawiki/extensions/SyntaxHighlight_GeSHi
     template:
-      - name: extension-phpcs
-      - name: extension-unittests-generic
+      - name: composer-test
       - name: npm
     check:
       - jsonlint
+      - extension-unittests-generic
 
   - name: mediawiki/extensions/TemplateData
     template:

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

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

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

Reply via email to