From ea1ea0b69da717dd1dcacefb0bc3ae9d132d8919 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Tue, 6 Sep 2016 13:41:28 +0300 Subject: [PATCH] Remove devops logic from k8s verify job Change-Id: I7321850a85eb588ac183e28b13827bdc3da0c805 --- utils/jenkins/run_k8s_verify.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/utils/jenkins/run_k8s_verify.sh b/utils/jenkins/run_k8s_verify.sh index 4dc2b5a..6d58c00 100755 --- a/utils/jenkins/run_k8s_verify.sh +++ b/utils/jenkins/run_k8s_verify.sh @@ -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