Skip to content
Permalink
Browse files
Fix for JENKINS-9773 - EC2 cannot deal with label expressions
  • Loading branch information
vjuranek committed May 26, 2011
1 parent 3e5ed16 commit 186d07d644157a6e93bacadf2145c0474266093d
Showing 2 changed files with 5 additions and 1 deletion.
@@ -124,7 +124,7 @@ public SlaveTemplate getTemplate(String ami) {
*/
public SlaveTemplate getTemplate(Label label) {
for (SlaveTemplate t : templates)
if(t.containsLabel(label))
if(label.matches(t.getLabelSet()))
return t;
return null;
}
@@ -102,6 +102,10 @@ public String getRootCommandPrefix() {
return rootCommandPrefix;
}

public Set getLabelSet(){
return labelSet;
}

/**
* Does this contain the given label?
*

0 comments on commit 186d07d

Please sign in to comment.