Fix test runner script

- Fix env vars
- Fix Deprovision command
- Split test and cluster config into separate /tmp directories
- combine cluster functions into lib/cluster.sh

scripts/lib/cluster.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+function down-test-cluster() {
+    echo "Deleting cluster $CLUSTER_NAME"
+    $TESTER_PATH eks delete cluster --path $CLUSTER_CONFIG
+}
+
+function up-test-cluster() {
+    echo "Creating cluster $CLUSTER_NAME"
+    ssh-keygen -P cni-test -f $SSH_KEY_PATH
+
+    $TESTER_PATH eks create config --path $CLUSTER_CONFIG
+
+    AWS_K8S_TESTER_EKS_CLUSTER_NAME=$CLUSTER_NAME \
+        AWS_K8S_TESTER_EKS_KUBECONFIG_PATH=$KUBECONFIG_PATH \
+        AWS_K8S_TESTER_EKS_KUBERNETES_VERSION=${K8S_VERSION%.*} \
+        AWS_K8S_TESTER_EKS_ENABLE_WORKER_NODE_PRIVILEGED_PORT_ACCESS=true \
+        AWS_K8S_TESTER_EKS_WORKER_NODE_ASG_MIN=3 \
+        AWS_K8S_TESTER_EKS_WORKER_NODE_ASG_MAX=3 \
+        AWS_K8S_TESTER_EKS_WORKER_NODE_ASG_DESIRED_CAPACITY=3 \
+        AWS_K8S_TESTER_EKS_WORKER_NODE_PRIVATE_KEY_PATH=$SSH_KEY_PATH \
+        AWS_K8S_TESTER_EKS_WORKER_NODE_INSTANCE_TYPE=m3.xlarge \
+        AWS_K8S_TESTER_EKS_AWS_K8S_TESTER_PATH=$TESTER_PATH \
+        AWS_K8S_TESTER_EKS_AWS_IAM_AUTHENTICATOR_PATH=$AUTHENTICATOR_PATH \
+        AWS_K8S_TESTER_EKS_KUBECTL_PATH=$KUBECTL_PATH \
+        $TESTER_PATH eks create cluster --path $CLUSTER_CONFIG 1>&2
+}

scripts/run-integration-tests.sh

@@ -3,29 +3,51 @@
 set -euo pipefail
 
 DIR=$(cd "$(dirname "$0")"; pwd)
-source $DIR/up-test-cluster.sh
-source $DIR/down-test-cluster.sh
+source $DIR/lib/cluster.sh
 
 OS=$(go env GOOS)
 ARCH=amd64
-TEST_ID=$RANDOM
-CLUSTER_NAME=test-cluster-$TEST_ID
-BASE_DIR=$(dirname $0)
-TEST_DIR=/tmp/cni-test
-REPORT_DIR=${TEST_DIR}/report
 REGION=${AWS_REGION:-us-west-2}
-K8S_VERSION=${K8S_VERSION:-1.14.1}
+K8S_VERSION=${K8S_VERSION:-1.14.6}
 PROVISION=${PROVISION:-true}
 DEPROVISION=${DEPROVISION:-true}
 BUILD=${BUILD:-true}
 
-echo "Testing in region: $REGION"
+# test specific config, results location
+TEST_ID=${TEST_ID:-$RANDOM}
+TEST_DIR=/tmp/cni-test/$(date "+%Y%M%d%H%M%S")-$TEST_ID
+REPORT_DIR=${TEST_DIR}/report
+
+# test cluster config location
+# Pass in CLUSTER_ID to reuse a test cluster
+CLUSTER_ID=${CLUSTER_ID:-$RANDOM}
+CLUSTER_NAME=cni-test-$CLUSTER_ID
+TEST_CLUSTER_DIR=/tmp/cni-test/cluster-$CLUSTER_NAME
+CLUSTER_CONFIG=${CLUSTER_CONFIG:-${TEST_CLUSTER_DIR}/${CLUSTER_NAME}.yaml}
+SSH_KEY_PATH=${SSH_KEY_PATH:-${TEST_CLUSTER_DIR}/id_rsa}
+KUBECONFIG_PATH=${KUBECONFIG_PATH:-${TEST_CLUSTER_DIR}/kubeconfig}
 
+# shared binaries
 TESTER_DOWNLOAD_URL=https://github.com/aws/aws-k8s-tester/releases/download/v0.4.3/aws-k8s-tester-v0.4.3-$OS-$ARCH
-TESTER_PATH=$TEST_DIR/aws-k8s-tester
+TESTER_PATH=${TESTER_PATH:-/tmp/aws-k8s-tester/aws-k8s-tester}
+AUTHENTICATOR_PATH=${AUTHENTICATOR_PATH:-/tmp/aws-k8s-tester/aws-iam-authenticator}
+KUBECTL_PATH=${KUBECTL_PATH:-/tmp/aws-k8s-tester/kubectl}
+
+# The version substituted in ./config/X/aws-k8s-cni.yaml
+CNI_TEMPLATE_VERSION=${CNI_TEMPLATE_VERSION:-v1.5}
+
+echo "Running $TEST_ID on $CLUSTER_NAME in $REGION"
+echo "+ Cluster config dir: $TEST_CLUSTER_DIR"
+echo "+ Result dir:         $TEST_DIR"
+echo "+ Tester:             $TESTER_PATH"
+echo "+ Kubeconfig:         $KUBECONFIG_PATH"
+echo "+ Node SSH key:       $SSH_KEY_PATH"
+echo "+ Cluster config:     $CLUSTER_CONFIG"
+echo ""
 
 mkdir -p $TEST_DIR
 mkdir -p $REPORT_DIR
+mkdir -p $TEST_CLUSTER_DIR
 
 # Download aws-k8s-tester if not yet
 if [[ ! -e $TESTER_PATH ]]; then
@@ -48,27 +70,31 @@ if [[ "$BUILD" = true ]]; then
     make docker IMAGE=$IMAGE_NAME VERSION=$IMAGE_VERSION
     docker push $IMAGE_NAME:$IMAGE_VERSION
 
-    sed -i'.bak' "s,602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni,$IMAGE_NAME," ./config/v1.5/aws-k8s-cni.yaml
-    sed -i'.bak' "s,v1.5.3,$IMAGE_VERSION," ./config/v1.5/aws-k8s-cni.yaml
+    echo "Using ./config/$CNI_TEMPLATE_VERSION/aws-k8s-cni.yaml as a template"
+    if [[ ! -f "./config/$CNI_TEMPLATE_VERSION/aws-k8s-cni.yaml" ]]; then
+        echo "./config/$CNI_TEMPLATE_VERSION/aws-k8s-cni.yaml DOES NOT exist. Set \$CNI_TEMPLATE_VERSION to an existing directory in ./config/"
+        exit
+    fi
+
+    sed -i'.bak' "s,602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni,$IMAGE_NAME," ./config/$CNI_TEMPLATE_VERSION/aws-k8s-cni.yaml
+    sed -i'.bak' "s,v1.5.3,$IMAGE_VERSION," ./config/$CNI_TEMPLATE_VERSION/aws-k8s-cni.yaml
 fi
 
 echo "Deploying CNI"
-export KUBECONFIG=/tmp/aws-k8s-tester/kubeconfig
-kubectl apply -f ./config/v1.5/aws-k8s-cni.yaml
+export KUBECONFIG=$KUBECONFIG_PATH
+kubectl apply -f ./config/$CNI_TEMPLATE_VERSION/aws-k8s-cni.yaml
 
 # Run the test
 pushd ./test/integration
 go test -v -timeout 0 ./... --kubeconfig=$KUBECONFIG --ginkgo.focus="\[cni-integration\]" --ginkgo.skip="\[Disruptive\]" \
-    --assets=${DIR}/../test/integration/assets
+    --assets=./assets
 TEST_PASS=$?
 popd
 
 if [[ "$DEPROVISION" = true ]]; then
     down-test-cluster
 fi
 
-rm -rf $TEST_DIR
-
 if [[ $TEST_PASS -ne 0 ]]; then
   exit 1
 fi