Use test driver image when testing upgrades with CT

Signed-off-by: Eddie Torres <[email protected]>

hack/e2e/run.sh

@@ -122,13 +122,13 @@ else
     GOPATH=${TEST_DIR} GOBIN=${BIN_DIR} go install sigs.k8s.io/kubetest2/...@latest
     popd
   fi
-
-  ecr_build_and_push "${REGION}" \
-    "${AWS_ACCOUNT_ID}" \
-    "${IMAGE_NAME}" \
-    "${IMAGE_TAG}"
 fi
 
+ecr_build_and_push "${REGION}" \
+  "${AWS_ACCOUNT_ID}" \
+  "${IMAGE_NAME}" \
+  "${IMAGE_TAG}"
+
 if [[ "${CLUSTER_TYPE}" == "kops" ]]; then
   kops_create_cluster \
     "$SSH_KEY_PATH" \
@@ -183,13 +183,15 @@ if [[ "${HELM_CT_TEST}" == true ]]; then
     export CT_REMOTE="ct"
     export CT_TARGET_BRANCH="${PULL_BASE_REF}"
   fi
+  yq -i ".image.repository = \"$IMAGE_NAME\" | .image.tag = \"$IMAGE_TAG\"" ${PWD}/charts/aws-ebs-csi-driver/values.yaml
   set -x
   set +e
   export KUBECONFIG="${KUBECONFIG}"
   ${CHART_TESTING_BIN} lint-and-install --config ${PWD}/tests/ct-config.yaml
   TEST_PASSED=$?
   set -e
   set +x
+  git checkout -- ${PWD}/charts/aws-ebs-csi-driver/values.yaml
 else
   loudecho "Deploying driver"
   startSec=$(date +'%s')