diff options
| -rwxr-xr-x | bootstrap/pillar_config.rb | 2 | ||||
| -rwxr-xr-x | bootstrap/run_salt.sh | 2 | ||||
| -rwxr-xr-x | build-docker-containers.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap/pillar_config.rb b/bootstrap/pillar_config.rb index 2577146..b720088 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("-", "_")}".gsub(/-#{branch}/, "") + "build_dir" => "/root/openbook_build/#{name.gsub("-", "_").gsub("_#{branch}", "")}" } end end diff --git a/bootstrap/run_salt.sh b/bootstrap/run_salt.sh index 6c973fd..ecbacb4 100755 --- a/bootstrap/run_salt.sh +++ b/bootstrap/run_salt.sh @@ -1,5 +1,5 @@ #!/bin/bash branch="${1}" -salt '*' state.highstate pillar="$($(dirname ${0})/pillar_config.rb ${branch})" +salt '*' state.highstate pillar="$($(dirname ${0})/pillar_config.rb --branch=${branch})" exit 0 diff --git a/build-docker-containers.sh b/build-docker-containers.sh index 38fbb24..8f7bad3 100755 --- a/build-docker-containers.sh +++ b/build-docker-containers.sh @@ -31,7 +31,7 @@ sudo ln -s ${buildroot}/salt /srv/salt cp ${HOME}/config.yaml /srv/bootstrap/ # run salt to create build scripts -sudo /srv/bootstrap/run_salt.sh --branch=${branch} +sudo /srv/bootstrap/run_salt.sh ${branch} # build new docker containers sudo /root/openbook_build/ci/build.sh ${artifact} |