From 00f2802b5a61806c5cd8d68677027ebe3e1bc6c3 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sun, 3 Apr 2016 14:06:23 -0400
Subject: [PATCH] Fix state and pillar targeting for numbered masters

We now number the servo-master IDs like other machines,
so use PCRE targeting to match the `servo-master\d+` pattern
for both states and the Travis test pillars.

This ensures the relevant pillars are available to master machines
and the master-specific states are applied.
---
 .travis/test_pillars/top.sls | 3 ++-
 top.sls                      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis/test_pillars/top.sls b/.travis/test_pillars/top.sls
index 68ae61b0..7c265b08 100644
--- a/.travis/test_pillars/top.sls
+++ b/.travis/test_pillars/top.sls
@@ -3,7 +3,8 @@ base:
     - travis
     - buildbot.common
 
-  'servo-master':
+  'servo-master\d+':
+    - match: pcre
     - buildbot.master
     - homu
 
diff --git a/top.sls b/top.sls
index e0498a05..7aac06a6 100644
--- a/top.sls
+++ b/top.sls
@@ -30,6 +30,7 @@ base:
     - xvfb
 
   'servo-master\d+':
+    - match: pcre
     - git
     - buildbot.master
     - homu