diff options
| author |   Bryan Sullivan <bryan.sullivan@att.com> | 2018-02-13 13:35:18 -0800 |
|---|---|---|
| committer | Bryan Sullivan <bryan.sullivan@att.com> | 2018-02-13 13:35:18 -0800 |
| commit | 6e0bfeb045314a0964bffee025889619d427522a (patch) | |
| tree | b4894911e2972ae337500791211019b5dfc8d650 | |
| parent | 0c7d63282c5c88c7f50eb68b720013e6ff579ba2 (diff) | |
Fix issues with use in Jenkins
JIRA: VES-2
Change-Id: I0d05b9aabf0c3ba9d0ec7e49c752586aaee24c33
Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>
| -rw-r--r-- | tools/demo_deploy.sh | 2 | ||||
| -rw-r--r-- | tools/ves-clean.sh | 2 | ||||
| -rw-r--r-- | tools/ves-setup.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/demo_deploy.sh b/tools/demo_deploy.sh index 5567ce6..9a4bd15 100644 --- a/tools/demo_deploy.sh +++ b/tools/demo_deploy.sh @@ -152,7 +152,7 @@ deploy_start=$((`date +%s`/60)) user=$1 master=$2 cloudify=$3 -source ~/k8s_env_$k8s_master_hostname.sh +source ~/k8s_env.sh log "k8s environment as input" env | grep k8s eval `ssh-agent` diff --git a/tools/ves-clean.sh b/tools/ves-clean.sh index 0f9b8d7..1a361f6 100644 --- a/tools/ves-clean.sh +++ b/tools/ves-clean.sh @@ -188,7 +188,7 @@ if [[ $(grep -c $HOSTNAME /etc/hosts) -eq 0 ]]; then sudo tee -a /etc/hosts fi -source ~/k8s_env_$k8s_master_hostname.sh +source ~/k8s_env.sh if [[ -f ~/ves/tools/ves_env.sh ]]; then source ~/ves/tools/ves_env.sh fi diff --git a/tools/ves-setup.sh b/tools/ves-setup.sh index aade964..8d5c902 100644 --- a/tools/ves-setup.sh +++ b/tools/ves-setup.sh @@ -425,7 +425,7 @@ if [[ $(grep -c $HOSTNAME /etc/hosts) -eq 0 ]]; then sudo tee -a /etc/hosts fi -source ~/k8s_env_$k8s_master_hostname.sh +source ~/k8s_env.sh if [[ -f ~/ves/tools/ves_env.sh ]]; then source ~/ves/tools/ves_env.sh fi |