debug

hack/run-e2e-gce.sh

@@ -24,34 +24,12 @@ export GOPATH="$(go env GOPATH)"
 REPO_ROOT=$(git rev-parse --show-toplevel)
 cd ${REPO_ROOT}
 
-# Setup our cleanup function; as we allocate resources we set a variable to indicate they should be cleaned up
-function cleanup {
-  if [[ "${CLEANUP_BOSKOS:-}" == "true" ]]; then
-    cleanup_boskos
-  fi
-  # shellcheck disable=SC2153
-  if [[ "${DELETE_CLUSTER:-}" == "true" ]]; then
-      kubetest2 ${KUBETEST2_ARGS} --down || echo "kubetest2 down failed"
-  fi
-}
-trap cleanup EXIT
-
-# Ensure we have a project; get one from boskos if one not provided in GCP_PROJECT
-source "${REPO_ROOT}"/hack/boskos.sh
-if [[ -z "${GCP_PROJECT:-}" ]]; then
-  echo "GCP_PROJECT not set, acquiring project from boskos"
-  acquire_project
-  CLEANUP_BOSKOS="true"
-fi
-echo "GCP_PROJECT=${GCP_PROJECT}"
-
 # IMAGE_REPO is used to upload images
 if [[ -z "${IMAGE_REPO:-}" ]]; then
-  IMAGE_REPO="gcr.io/${GCP_PROJECT}"
+  IMAGE_REPO="gcr.io/k8s-ingress-image-push"
 fi
 echo "IMAGE_REPO=${IMAGE_REPO}"
 
-cd ${REPO_ROOT}
 export KO_DOCKER_REPO="${IMAGE_REPO}"
 if [[ -z "${IMAGE_TAG:-}" ]]; then
   IMAGE_TAG=$(git rev-parse --short HEAD)-$(date +%Y%m%dT%H%M%S)
@@ -60,6 +38,11 @@ fi
 export GCE_GLBC_IMAGE=$(go run github.com/google/[email protected] build --tags ${IMAGE_TAG} --base-import-paths --push=true ./cmd/glbc/)
 echo "GCE_GLBC_IMAGE=${GCE_GLBC_IMAGE}"
 
+# Setup our cleanup function; as we allocate resources we set a variable to indicate they should be cleaned up
+function cleanup {
+  gcloud container images delete $GCE_GLBC_IMAGE --quiet
+}
+trap cleanup EXIT
 
 export CUSTOM_INGRESS_YAML=$(cat <<EOF
 apiVersion: v1
@@ -144,15 +127,13 @@ spec:
 EOF
 )
 
-
-/workspace/./test-infra/jenkins/../scenarios/kubernetes_e2e.py --check-leaked-resources \
-  --cluster= \
-  --env=GCE_ALPHA_FEATURES=NetworkEndpointGroup \
-  --env=KUBE_GCE_ENABLE_IP_ALIASES=true \
+kubetest \
   --extract=ci/latest \
   --gcp-project-type=ingress-project \
   --gcp-zone=us-west1-b \
-  --ginkgo-parallel=10 \
   --provider=gce \
-  '--test_args=--ginkgo.focus=\[Feature:Ingress\]|\[Feature:NEG\]' \
-  --timeout=320m
+  --up --test --down \
+  --check-leaked-resources \
+  --ginkgo-parallel=10 \
+  --test_args="--ginkgo.flakeAttempts=2 --ginkgo.skip=\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[DisabledForLargeClusters\] --minStartupPods=8" \
+  --timeout=120m