Merge pull request #65 from dabercro/pass-echo

Pass _ECHO in site name check
CMSCompOps · Apr 26, 2018 · f605a6e · f605a6e
2 parents 24b0da5 + df99627
commit f605a6e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,10 @@
 language: python
 cache: pip
-addons:
-  apt:
-    sources: debian-sid
-    packages: shellcheck
+# IPv6 isn't working. Disable for now
+#addons:
+#  apt:
+#    sources: debian-sid
+#    packages: shellcheck
 matrix:
   include:
     - python: 2.6

diff --git a/CMSToolBox/workflowinfo.py b/CMSToolBox/workflowinfo.py
@@ -350,7 +350,7 @@ def site_to_run(self, task):
         all_site_list = site_list()
 
         for site in site_set:
-            clean_site = re.sub(r'_(Disk|MSS)$', '', site)
+            clean_site = re.sub(r'_(ECHO_)?(Disk|MSS)$', '', site)
             if clean_site not in out_list and clean_site and \
                     clean_site in all_site_list:
                 out_list.append(clean_site)