From 8a1ea7c6ae0f585e57772513c8045103fd7339bc Mon Sep 17 00:00:00 2001
From: Nghia Tran <nghia@google.com>
Date: Sat, 23 May 2020 01:43:56 +0000
Subject: [PATCH 1/2] Increase webhook resources.

---
 config/core/deployments/webhook.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/core/deployments/webhook.yaml b/config/core/deployments/webhook.yaml
index 3ccc6da637e6..946dc791206e 100644
--- a/config/core/deployments/webhook.yaml
+++ b/config/core/deployments/webhook.yaml
@@ -42,11 +42,11 @@ spec:
 
         resources:
           requests:
-            cpu: 20m
-            memory: 20Mi
+            cpu: 100m
+            memory: 100Mi
           limits:
-            cpu: 200m
-            memory: 200Mi
+            cpu: 500m
+            memory: 500Mi
 
         env:
         - name: SYSTEM_NAMESPACE

From 465a6e37951dd7ea58b6c3eb38892a60f4dc0831 Mon Sep 17 00:00:00 2001
From: Nghia Tran <nghia@google.com>
Date: Fri, 22 May 2020 22:42:10 -0700
Subject: [PATCH 2/2] Skip the TestUpdate.

---
 test/e2e-tests.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh
index 4ebafddebd08..fb120ec47f4e 100755
--- a/test/e2e-tests.sh
+++ b/test/e2e-tests.sh
@@ -59,11 +59,17 @@ fi
 # Run conformance and e2e tests.
 
 go_test_e2e -timeout=30m \
-  $(go list ./test/conformance/... | grep -v certificate) \
-  ./test/e2e \
+  $(go list ./test/conformance/... | grep -v 'certificate\|ingress' ) \
+  ./test/e2e ./test/e2e/hpa \
   ${parallelism} \
   "--resolvabledomain=$(use_resolvable_domain)" "${use_https}" "$(ingress_class)" || failed=1
 
+# We run KIngress conformance ingress separately, to make it easier to skip some tests.
+go_test_e2e -timeout=20m ./test/conformance/ingress ${parallelism}  \
+  `# Skip TestUpdate due to excessive flaking https://github.com/knative/serving/issues/8032` \
+  -run="Test[^U]" \
+  "--resolvabledomain=$(use_resolvable_domain)" "${use_https}" "$(ingress_class)" || failed=1
+
 if (( HTTPS )); then
   kubectl delete -f ./test/config/autotls/certmanager/caissuer/ --ignore-not-found
   turn_off_auto_tls