From 12e0aa0168fca1a1c2ecf47c10c0d0a751acd024 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <detiberusj@vmware.com>
Date: Fri, 17 Apr 2020 17:36:38 -0400
Subject: [PATCH] more fixes

---
 hack/ci/e2e-conformance.sh | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/hack/ci/e2e-conformance.sh b/hack/ci/e2e-conformance.sh
index caa6d0d2c8..8327a145db 100755
--- a/hack/ci/e2e-conformance.sh
+++ b/hack/ci/e2e-conformance.sh
@@ -432,7 +432,7 @@ main() {
 
   if [[ -z "$GOOGLE_APPLICATION_CREDENTIALS" ]]; then
     cat <<EOF
-$GOOGLE_APPLICATION_CREDENTIALS is not set.
+GOOGLE_APPLICATION_CREDENTIALS is not set.
 Please set this to the path of the service account used to run this script.
 EOF
     return 2
@@ -464,7 +464,11 @@ EOF
   mkdir -p "${ARTIFACTS}/logs"
 
   # Initialize the necessary network requirements
-  init_networks
+  if [[ -n "${SKIP_INIT_NETWORK:-}" ]]; then
+    echo "Skipping network initialization..."
+  else
+    init_networks
+  fi
 
   if [[ -n ${CI_VERSION:-} || -n ${USE_CI_ARTIFACTS:-} ]]; then
     CI_VERSION=${CI_VERSION:-$(curl -sSL https://dl.k8s.io/ci/k8s-master.txt)}
@@ -474,19 +478,24 @@ EOF
   fi
 
   if [[ -n "${SKIP_INIT_IMAGE:-}" ]]; then
-    echo "Skipping image initialization..."
+    echo "Skipping GCP image initialization..."
   else
     init_image
   fi
 
   # Build the images
-  (GCP_PROJECT=${GCP_PROJECT} \
-  PULL_POLICY=Never \
-    make modules docker-build)
+  if [[ -n "${SKIP_IMAGE_BUILD:-}" ]]; then
+    echo "Skipping Container image building..."
+  else
+    (GCP_PROJECT=${GCP_PROJECT} PULL_POLICY=Never make modules docker-build)
+  fi
 
   # create cluster
-  if [[ -z "${SKIP_CREATE_CLUSTER:-}" ]]; then
+  if [[ -n "${SKIP_CREATE_CLUSTER:-}" ]]; then
+    echo "Skipping cluster creation..."
+  else
     if [[ -n ${CI_VERSION:-} ]]; then
+      echo "Adding kustomize patch for ci version..."
       add_kustomize_patch
     fi
     create_cluster