Commit 508c4c23 by John Jarvis

use WORKSPACE if it exists for jenkins

parent 4f2bd773
...@@ -31,7 +31,13 @@ if [[ -z $deploy_host ]]; then ...@@ -31,7 +31,13 @@ if [[ -z $deploy_host ]]; then
deploy_host="${github_username}.m.sandbox.edx.org" deploy_host="${github_username}.m.sandbox.edx.org"
fi fi
source "$dir/create-var-file.sh" if [[ -z $WORKSPACE ]]; then
dir=$(dirname $0)
source "$dir/ascii-convert.sh"
else
source "$WORKSPACE/util/jenkins/create-var-file.sh"
fi
# vars specific to deploy added to $extra-vars # vars specific to deploy added to $extra-vars
cat << EOF >> $extra_vars cat << EOF >> $extra_vars
......
...@@ -65,8 +65,12 @@ fi ...@@ -65,8 +65,12 @@ fi
deploy_host="${dns_name}.${dns_zone}" deploy_host="${dns_name}.${dns_zone}"
# creates a var file if [[ -z $WORKSPACE ]]; then
source "$dir/create-var-file.sh" dir=$(dirname $0)
source "$dir/ascii-convert.sh"
else
source "$WORKSPACE/util/jenkins/create-var-file.sh"
fi
# vars specific to provisioning added to $extra-vars # vars specific to provisioning added to $extra-vars
cat << EOF >> $extra_vars cat << EOF >> $extra_vars
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment