Skip to content

Commit

Permalink
Allow release version builds for make release-test-*
Browse files Browse the repository at this point in the history
This fixes #41
  • Loading branch information
neelimamukiri committed Feb 18, 2017
1 parent 008f382 commit 6f2b963
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion scripts/kubeadm_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ install_version="contiv-${BUILD_VERSION:-devbuild}"
default_net_cidr="${DEFAULT_NET:-20.1.1.0/24}"

# For local builds, copy the build binaries to the vagrant node, using the vagrant ssh-key
if [ "$install_version" = "contiv-devbuild" ];then
if [ -f "release/${install_version}.tgz" ];then
pushd cluster
ssh_key=$(CONTIV_KUBEADM=1 vagrant ssh-config contiv-node1 | grep IdentityFile | awk '{print $2}' | xargs)
popd
Expand Down
2 changes: 1 addition & 1 deletion scripts/swarm_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ popd
# Extract and launch the installer
mkdir -p release
cd release
if [ "$install_version" != "contiv-devbuild" ];then
if [ ! -f "${install_version}.tgz" ];then
# For release builds, get the build from github releases
curl -L -O https://github.com/contiv/install/releases/download/${BUILD_VERSION}/${install_version}.tgz
fi
Expand Down

0 comments on commit 6f2b963

Please sign in to comment.