Testing - Clean up the Argo controller that was used to build images (#…

…1311)

* Testing - Clean up the Argo controller that was used to build images

* Try to not install Argo in the first place

* Added the test-runner service account

* Cleanup

* Changing the install-argo.sh script instead

test/install-argo.sh

@@ -16,6 +16,7 @@
 
 set -ex
 
+# Tests work without these lines. TODO: Verify and remove these lines
 kubectl config set-context $(kubectl config current-context) --namespace=default
 echo "Add necessary cluster role bindings"
 ACCOUNT=$(gcloud info --format='value(config.account)')
@@ -28,8 +29,8 @@ mkdir -p ~/bin/
 export PATH=~/bin/:$PATH
 curl -sSL -o ~/bin/argo https://github.com/argoproj/argo/releases/download/$ARGO_VERSION/argo-linux-amd64
 chmod +x ~/bin/argo
-kubectl create ns argo
-kubectl apply -n argo -f https://raw.githubusercontent.com/argoproj/argo/$ARGO_VERSION/manifests/install.yaml
+#kubectl create ns argo
+#kubectl apply -n argo -f https://raw.githubusercontent.com/argoproj/argo/$ARGO_VERSION/manifests/install.yaml
 
 # Some workflows are deployed to the non-default namespace where the GCP credential secret is stored
 # In this case, the default service account in that namespace doesn't have enough permission

test/postsubmit-tests-with-pipeline-deployment.sh

@@ -70,10 +70,6 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null && pwd)"
 echo "postsubmit test starts"
 
 source "${DIR}/test-prep.sh"
-source "${DIR}/deploy-kubeflow.sh"
-
-# Install Argo
-source "${DIR}/install-argo.sh"
 
 ## Wait for the cloudbuild job to be started
 CLOUDBUILD_TIMEOUT_SECONDS=3600
@@ -118,6 +114,9 @@ elif [[ ${CLOUDBUILD_FINISHED} == TIMEOUT ]];then
   exit 1
 fi
 
+# Deploy Kubeflow
+source "${DIR}/deploy-kubeflow.sh"
+
 # Deploy the pipeline
 source ${DIR}/deploy-pipeline.sh --gcr_image_base_dir ${GCR_IMAGE_BASE_DIR} --gcr_image_tag ${PULL_BASE_SHA}
 

test/presubmit-tests-with-pipeline-deployment.sh

@@ -66,9 +66,11 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null && pwd)"
 
 echo "presubmit test starts"
 source "${DIR}/test-prep.sh"
+
+# Deploy Kubeflow
 source "${DIR}/deploy-kubeflow.sh"
 
-# Install Argo
+# Install Argo CLI and test-runner service account
 source "${DIR}/install-argo.sh"
 
 # Build Images