From 1a7ca663a161a705879971340d7ef136d17bd050 Mon Sep 17 00:00:00 2001
From: Clay Kauzlaric <ckauzlaric@vmware.com>
Date: Mon, 30 Jan 2023 11:31:29 -0500
Subject: [PATCH] Revert "add new job to run internal encryption tests for
 Contour (#3649)" (#3694)

This reverts commit 71d847859a56204be4c81e380f8b2b5f6effd4dc.
---
 .../generated/knative/serving-main.gen.yaml   | 54 -------------------
 prow/jobs_config/knative/serving.yaml         |  6 ---
 2 files changed, 60 deletions(-)

diff --git a/prow/jobs/generated/knative/serving-main.gen.yaml b/prow/jobs/generated/knative/serving-main.gen.yaml
index 1fdf33a5e4b..31aa72a09b4 100644
--- a/prow/jobs/generated/knative/serving-main.gen.yaml
+++ b/prow/jobs/generated/knative/serving-main.gen.yaml
@@ -1895,60 +1895,6 @@ presubmits:
           type: Directory
         name: cgroup
     trigger: ((?m)^/test( | .* )contour-tls,?($|\s.*))|((?m)^/test( | .* )contour-tls_serving_main,?($|\s.*))
-  - always_run: false
-    branches:
-    - ^main$
-    cluster: prow-build
-    decorate: true
-    name: contour-internal-encryption_serving_main
-    path_alias: knative.dev/serving
-    rerun_command: /test contour-internal-encryption
-    run_if_changed: ^third_party/contour-latest/*
-    spec:
-      containers:
-      - command:
-        - runner.sh
-        - ./test/presubmit-tests.sh
-        - --run-test
-        - ./test/e2e-internal-encryption-tests.sh --contour-version latest
-        env:
-        - name: E2E_CLUSTER_REGION
-          value: us-central1
-        - name: DOCKER_IN_DOCKER_ENABLED
-          value: "true"
-        image: gcr.io/knative-tests/test-infra/prow-tests:v20230126-0d51bee0
-        name: ""
-        resources:
-          limits:
-            memory: 16Gi
-          requests:
-            memory: 12Gi
-        securityContext:
-          privileged: true
-        volumeMounts:
-        - mountPath: /docker-graph
-          name: docker-graph
-        - mountPath: /lib/modules
-          name: modules
-        - mountPath: /sys/fs/cgroup
-          name: cgroup
-      nodeSelector:
-        kubernetes.io/arch: amd64
-        type: testing
-      serviceAccountName: test-runner
-      volumes:
-      - emptyDir: {}
-        name: docker-graph
-      - hostPath:
-          path: /lib/modules
-          type: Directory
-        name: modules
-      - hostPath:
-          path: /sys/fs/cgroup
-          type: Directory
-        name: cgroup
-    trigger: ((?m)^/test( | .* )contour-internal-encryption,?($|\s.*))|((?m)^/test(
-      | .* )contour-internal-encryption_serving_main,?($|\s.*))
   - always_run: false
     branches:
     - ^main$
diff --git a/prow/jobs_config/knative/serving.yaml b/prow/jobs_config/knative/serving.yaml
index 079b135807d..6596fae79cc 100644
--- a/prow/jobs_config/knative/serving.yaml
+++ b/prow/jobs_config/knative/serving.yaml
@@ -78,12 +78,6 @@ jobs:
     command: [runner.sh, ./test/presubmit-tests.sh, --run-test, "./test/e2e-auto-tls-tests.sh --contour-version latest"]
     modifiers: [presubmit_skipped]
 
-  - name: contour-internal-encryption
-    types: [presubmit]
-    regex: ^third_party/contour-latest/*
-    command: [runner.sh, ./test/presubmit-tests.sh, --run-test, "./test/e2e-internal-encryption-tests.sh --contour-version latest"]
-    modifiers: [presubmit_skipped]
-
   - name: gateway-api-latest
     types: [presubmit]
     regex: ^third_party/gateway-api-latest/*