[151104] contrib/buildbot-test/master.cfg

[ryandesign at macports.org]

Revision: 151104
          https://trac.macports.org/changeset/151104
Author:   ryandesign at macports.org
Date:     2016-08-07 07:34:52 -0700 (Sun, 07 Aug 2016)
Log Message:
-----------
buildbot-test: use OS version for tags instead of plat

Modified Paths:
--------------
    contrib/buildbot-test/master.cfg

Modified: contrib/buildbot-test/master.cfg
===================================================================
--- contrib/buildbot-test/master.cfg	2016-08-07 14:34:18 UTC (rev 151103)
+++ contrib/buildbot-test/master.cfg	2016-08-07 14:34:52 UTC (rev 151104)
@@ -431,14 +431,17 @@
     portsslaves[plat] = filter(lambda x: x.endswith(plat+"-ports"), slavenames)
 
 c['builders']=[]
+extract_os = re.compile("10\.\d+")
 for plat in build_platforms:
+    os_match = extract_os.search(plat)
+    os = os_match.group(0) if os_match else plat
     if 'legacy' not in plat and '10.6_i386' not in plat:
         c['builders'] += [
             BuilderConfig(
                 name="base-" + plat,
                 slavenames=["base-" + plat],
                 factory=base_factory,
-                tags=["base", plat],
+                tags=["base", os],
                 env={"PATH": "/usr/bin:/bin:/usr/sbin:/sbin"})]
     if 'linux' not in plat:
         c['builders'] += [
@@ -446,13 +449,13 @@
                 name="ports-" + plat + "-watcher",
                 slavenames=["ports-" + plat],
                 factory=make_portwatcher_factory("ports-" + plat + "-trigger"),
-                tags=["portwatcher", plat],
+                tags=["portwatcher", os],
                 env={"PATH": toolsprefix + "/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"}),
             BuilderConfig(
                 name="ports-" + plat + "-builder",
                 slavenames=["ports-" + plat],
                 factory=portbuilder_factory,
-                tags=["portbuilder", plat],
+                tags=["portbuilder", os],
                 env={"PATH": toolsprefix + "/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"})]
 
 ####### STATUS TARGETS
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160807/d10a58a2/attachment.html>