summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorckonstanski <ckonstanski@pippiandcarlos.com>2017-10-24 19:15:42 -0600
committerckonstanski <ckonstanski@pippiandcarlos.com>2017-10-24 19:15:42 -0600
commitad7ae36edbb6a0b3d3b3b14adde880537c3b1ee4 (patch)
tree2e85f612c08f381fb2962456e89478ca523bc2aa
parentabf35114043b865f415cfa7c6f4e5a3a16d0cf96 (diff)
make work for all 4 git branches
-rwxr-xr-xbootstrap/pillar_config.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/bootstrap/pillar_config.rb b/bootstrap/pillar_config.rb
index b720088..56bdb3d 100755
--- a/bootstrap/pillar_config.rb
+++ b/bootstrap/pillar_config.rb
@@ -40,7 +40,7 @@ def get_jar_versions(yml, branch)
jar_name = line.chomp.split(/[<>]/)[2]
jarparts = jar_name.split(/\//)
name, *version_parts, junk1 = jarparts[jarparts.length - 1].split(".")
- ret["#{name.gsub("-", "_")}"] = {
+ ret["#{name.gsub("-", "_").gsub("_#{branch}", "")}"] = {
"jar_name" => jarparts[jarparts.length - 1],
"jar_version" => version_parts.join("."),
"image_name" => "openbook_#{name.gsub("-", "_")}",