x
/
fuel-ccp-installer
Code Issues Proposed changes

Remove devops logic from k8s verify job 

Change-Id: I7321850a85eb588ac183e28b13827bdc3da0c805
This commit is contained in:
Matthew Mosesohn 2016-09-06 13:41:28 +03:00
parent bb4073d486
commit ea1ea0b69d
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
utils/jenkins/run_k8s_verify.sh
View File

@ -13,6 +13,9 @@ NODE_BASE_OS=${NODE_BASE_OS:-ubuntu}
OS_SPECIFIC_DEFAULTS_YAML="kargo_default_${NODE_BASE_OS}.yaml"
OS_SPECIFIC_DEFAULTS_SRC="${BASH_SOURCE%/*}/../kargo/${OS_SPECIFIC_DEFAULTS_YAML}"
SLAVE_IPS=( $SLAVE_IPS )
ADMIN_IP=${ADMIN_IP:-${SLAVE_IPS[0]}}
required_ansible_version="2.1.0"
function exit_gracefully {
@ -86,16 +89,6 @@ function with_ansible {
mkdir -p tmp logs
# If SLAVE_IPS are specified or REAPPLY is set, then treat env as pre-provisioned
if [[ -z "$REAPPLY" && -z "$SLAVE_IPS" ]]; then
SLAVE_IPS=($(ENV_NAME=${ENV_NAME} python ${BASH_SOURCE%/*}/env.py get_slaves_ips | tr -d "[],'"))
# Set ADMIN_IP=local to use current host to run ansible
ADMIN_IP=${ADMIN_IP:-${SLAVE_IPS[0]}}
wait_for_nodes $ADMIN_IP
else
SLAVE_IPS=( $SLAVE_IPS )
ADMIN_IP=${ADMIN_IP:-${SLAVE_IPS[0]}}
fi
# Trap errors during env preparation stage
trap exit_gracefully ERR INT TERM