diff options
| author | ckonstanski <ckonstanski@pippiandcarlos.com> | 2017-10-24 19:01:21 -0600 |
|---|---|---|
| committer | ckonstanski <ckonstanski@pippiandcarlos.com> | 2017-10-24 19:01:21 -0600 |
| commit | fa2f0bdae8c58b420f76d8246c9e0b5d0013e9f1 (patch) | |
| tree | e79d144cae5a22f373e77d7adfe71b3550c78a98 | |
| parent | 0493747f5d1b30008b4170b3d48080abfa224700 (diff) | |
make work for all 4 git branches
| -rwxr-xr-x | bootstrap/pillar_config.rb | 2 | ||||
| -rw-r--r-- | jjb/yaml/openbook-database.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bootstrap/pillar_config.rb b/bootstrap/pillar_config.rb index 9b0b1bb..62c424c 100755 --- a/bootstrap/pillar_config.rb +++ b/bootstrap/pillar_config.rb @@ -45,7 +45,7 @@ def get_jar_versions(yml, branch) "jar_version" => version_parts.join("."), "image_name" => "openbook_#{name.gsub("-", "_")}", "container_name" => "#{name.gsub("-", "_")}", - "build_dir" => "/root/openbook_build/#{name.gsub("-", "_")}" + "build_dir" => "/root/openbook_build/#{name.gsub("-", "_")}".replace("-#{branch}", "") } end end diff --git a/jjb/yaml/openbook-database.yaml b/jjb/yaml/openbook-database.yaml index 7482ed1..5a98085 100644 --- a/jjb/yaml/openbook-database.yaml +++ b/jjb/yaml/openbook-database.yaml @@ -18,4 +18,4 @@ - master builders: - shell: | - ./build-docker-containers.sh database + ./build-docker-containers.sh database unstable |