From 3b71223b7547ea191c8c35c65cb41a7b32a3e72c Mon Sep 17 00:00:00 2001
From: Knative Prow Updater Robot <automation+prow-updater-robot@knative.team>
Date: Tue, 23 Jul 2024 13:07:11 +0100
Subject: [PATCH] [Auto] Update prow jobs for release branches (#474)

---
 ...yaml => net-contour-release-1.15.gen.yaml} |  36 +-
 ...gen.yaml => serving-release-1.15.gen.yaml} | 417 +++++-------------
 ....13.yaml => net-contour-release-1.15.yaml} |   4 +-
 ...se-1.13.yaml => serving-release-1.15.yaml} |  92 +---
 4 files changed, 143 insertions(+), 406 deletions(-)
 rename prow/jobs/generated/knative-extensions/{net-contour-release-1.13.gen.yaml => net-contour-release-1.15.gen.yaml} (87%)
 rename prow/jobs/generated/knative/{serving-release-1.13.gen.yaml => serving-release-1.15.gen.yaml} (72%)
 rename prow/jobs_config/knative-extensions/{net-contour-release-1.13.yaml => net-contour-release-1.15.yaml} (97%)
 rename prow/jobs_config/knative/{serving-release-1.13.yaml => serving-release-1.15.yaml} (76%)

diff --git a/prow/jobs/generated/knative-extensions/net-contour-release-1.13.gen.yaml b/prow/jobs/generated/knative-extensions/net-contour-release-1.15.gen.yaml
similarity index 87%
rename from prow/jobs/generated/knative-extensions/net-contour-release-1.13.gen.yaml
rename to prow/jobs/generated/knative-extensions/net-contour-release-1.15.gen.yaml
index d4a874351..6a5d9501e 100644
--- a/prow/jobs/generated/knative-extensions/net-contour-release-1.13.gen.yaml
+++ b/prow/jobs/generated/knative-extensions/net-contour-release-1.15.gen.yaml
@@ -7,17 +7,17 @@
 
 periodics:
 - annotations:
-    testgrid-dashboards: knative-extensions-release-1.13
+    testgrid-dashboards: knative-extensions-release-1.15
     testgrid-tab-name: net-contour-continuous
   cluster: prow-build
-  cron: 14 21 * * *
+  cron: 8 3 * * *
   decorate: true
   extra_refs:
-  - base_ref: release-1.13
+  - base_ref: release-1.15
     org: knative-extensions
     path_alias: knative.dev/net-contour
     repo: net-contour
-  name: continuous_net-contour_release-1.13_periodic
+  name: continuous_net-contour_release-1.15_periodic
   spec:
     containers:
     - command:
@@ -47,18 +47,18 @@ periodics:
           path: service-account.json
         secretName: prow-google-credentials
 - annotations:
-    testgrid-dashboards: knative-extensions-release-1.13
+    testgrid-dashboards: knative-extensions-release-1.15
     testgrid-tab-name: net-contour-release
   cluster: prow-build
-  cron: 50 9 * * 2
+  cron: 0 9 * * 2
   decorate: true
   extra_refs:
-  - base_ref: release-1.13
+  - base_ref: release-1.15
     org: knative-extensions
     path_alias: knative.dev/net-contour
     repo: net-contour
   max_concurrency: 1
-  name: release_net-contour_release-1.13_periodic
+  name: release_net-contour_release-1.15_periodic
   spec:
     containers:
     - command:
@@ -72,7 +72,7 @@ periodics:
       - --github-token
       - /etc/hub-token/token
       - --branch
-      - release-1.13
+      - release-1.15
       env:
       - name: GOOGLE_APPLICATION_CREDENTIALS
         value: /etc/release-account/service-account.json
@@ -114,10 +114,10 @@ presubmits:
   knative-extensions/net-contour:
   - always_run: true
     branches:
-    - ^release-1.13$
+    - ^release-1.15$
     cluster: prow-build
     decorate: true
-    name: build-tests_net-contour_release-1.13
+    name: build-tests_net-contour_release-1.15
     path_alias: knative.dev/net-contour
     rerun_command: /test build-tests
     spec:
@@ -134,13 +134,13 @@ presubmits:
       nodeSelector:
         kubernetes.io/arch: amd64
         type: testing
-    trigger: ((?m)^/test( | .* )build-tests,?($|\s.*))|((?m)^/test( | .* )build-tests_net-contour_release-1.13,?($|\s.*))
+    trigger: ((?m)^/test( | .* )build-tests,?($|\s.*))|((?m)^/test( | .* )build-tests_net-contour_release-1.15,?($|\s.*))
   - always_run: true
     branches:
-    - ^release-1.13$
+    - ^release-1.15$
     cluster: prow-build
     decorate: true
-    name: unit-tests_net-contour_release-1.13
+    name: unit-tests_net-contour_release-1.15
     path_alias: knative.dev/net-contour
     rerun_command: /test unit-tests
     spec:
@@ -157,13 +157,13 @@ presubmits:
       nodeSelector:
         kubernetes.io/arch: amd64
         type: testing
-    trigger: ((?m)^/test( | .* )unit-tests,?($|\s.*))|((?m)^/test( | .* )unit-tests_net-contour_release-1.13,?($|\s.*))
+    trigger: ((?m)^/test( | .* )unit-tests,?($|\s.*))|((?m)^/test( | .* )unit-tests_net-contour_release-1.15,?($|\s.*))
   - always_run: true
     branches:
-    - ^release-1.13$
+    - ^release-1.15$
     cluster: prow-build
     decorate: true
-    name: integration-tests_net-contour_release-1.13
+    name: integration-tests_net-contour_release-1.15
     path_alias: knative.dev/net-contour
     rerun_command: /test integration-tests
     spec:
@@ -194,4 +194,4 @@ presubmits:
           - key: service-account-key.json
             path: service-account.json
           secretName: prow-google-credentials
-    trigger: ((?m)^/test( | .* )integration-tests,?($|\s.*))|((?m)^/test( | .* )integration-tests_net-contour_release-1.13,?($|\s.*))
+    trigger: ((?m)^/test( | .* )integration-tests,?($|\s.*))|((?m)^/test( | .* )integration-tests_net-contour_release-1.15,?($|\s.*))
diff --git a/prow/jobs/generated/knative/serving-release-1.13.gen.yaml b/prow/jobs/generated/knative/serving-release-1.15.gen.yaml
similarity index 72%
rename from prow/jobs/generated/knative/serving-release-1.13.gen.yaml
rename to prow/jobs/generated/knative/serving-release-1.15.gen.yaml
index 23c61891d..8bc888257 100644
--- a/prow/jobs/generated/knative/serving-release-1.13.gen.yaml
+++ b/prow/jobs/generated/knative/serving-release-1.15.gen.yaml
@@ -7,19 +7,19 @@
 
 periodics:
 - annotations:
-    testgrid-dashboards: knative-release-1.13
+    testgrid-dashboards: knative-release-1.15
     testgrid-tab-name: serving-continuous
   cluster: prow-build
-  cron: 43 2 * * *
+  cron: 45 4 * * *
   decorate: true
   decoration_config:
     timeout: 3h0m0s
   extra_refs:
-  - base_ref: release-1.13
+  - base_ref: release-1.15
     org: knative
     path_alias: knative.dev/serving
     repo: serving
-  name: continuous_serving_release-1.13_periodic
+  name: continuous_serving_release-1.15_periodic
   spec:
     containers:
     - command:
@@ -61,275 +61,20 @@ periodics:
         type: Directory
       name: cgroup
 - annotations:
-    testgrid-dashboards: knative-release-1.13
-    testgrid-tab-name: serving-s390x-kourier-tests
-  cluster: prow-build
-  cron: 20 6 * * *
-  decorate: true
-  extra_refs:
-  - base_ref: release-1.13
-    org: knative
-    path_alias: knative.dev/serving
-    repo: serving
-  name: s390x-kourier-tests_serving_release-1.13_periodic
-  spec:
-    containers:
-    - args:
-      - bash
-      - -c
-      - |
-        mkdir -p /root/.kube
-        cat /opt/cluster/ci-script > connect.sh
-        chmod +x connect.sh
-        server_addr=$(./connect.sh kourier-113)
-        kubectl get cm s390x-config-serving -n default -o jsonpath='{.data.adjustment-script}' > adjust.sh
-        chmod +x adjust.sh
-        ./adjust.sh
-        export TEST_OPTIONS=$TEST_OPTIONS' --ingressendpoint '${server_addr}
-        ./test/e2e-tests.sh --run-tests --kourier-version latest
-      command:
-      - runner.sh
-      env:
-      - name: SYSTEM_NAMESPACE
-        value: knative-serving
-      - name: TEST_OPTIONS
-        value: --enable-alpha --enable-beta --resolvabledomain=false
-      - name: DOCKER_IN_DOCKER_ENABLED
-        value: "true"
-      - name: KO_FLAGS
-        value: --platform=linux/s390x
-      - name: PLATFORM
-        value: linux/s390x
-      - name: KO_DOCKER_REPO
-        valueFrom:
-          secretKeyRef:
-            key: ko-docker-repo
-            name: s390x-cluster1
-      - name: KUBECONFIG
-        value: /root/.kube/config
-      - name: DOCKER_CONFIG
-        value: /opt/cluster
-      image: us-docker.pkg.dev/knative-tests/images/prow-tests:v20240704-35a1eee1c
-      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
-      - mountPath: /opt/cluster
-        name: s390x-cluster1
-        readOnly: true
-    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
-    - name: s390x-cluster1
-      secret:
-        defaultMode: 384
-        secretName: s390x-cluster1
-- annotations:
-    testgrid-dashboards: knative-release-1.13
-    testgrid-tab-name: serving-s390x-contour-tests
-  cluster: prow-build
-  cron: 20 7 * * *
-  decorate: true
-  extra_refs:
-  - base_ref: release-1.13
-    org: knative
-    path_alias: knative.dev/serving
-    repo: serving
-  name: s390x-contour-tests_serving_release-1.13_periodic
-  spec:
-    containers:
-    - args:
-      - bash
-      - -c
-      - |
-        mkdir -p /root/.kube
-        cat /opt/cluster/ci-script > connect.sh
-        chmod +x connect.sh
-        server_addr=$(./connect.sh contour-113)
-        kubectl get cm s390x-config-serving -n default -o jsonpath='{.data.adjustment-script}' > adjust.sh
-        chmod +x adjust.sh
-        ./adjust.sh
-        export TEST_OPTIONS=$TEST_OPTIONS' --ingressendpoint '${server_addr}
-        ./test/e2e-tests.sh --run-tests --contour-version latest
-      command:
-      - runner.sh
-      env:
-      - name: SYSTEM_NAMESPACE
-        value: knative-serving
-      - name: TEST_OPTIONS
-        value: --enable-alpha --enable-beta --resolvabledomain=false
-      - name: DOCKER_IN_DOCKER_ENABLED
-        value: "true"
-      - name: KO_FLAGS
-        value: --platform=linux/s390x
-      - name: PLATFORM
-        value: linux/s390x
-      - name: KO_DOCKER_REPO
-        valueFrom:
-          secretKeyRef:
-            key: ko-docker-repo
-            name: s390x-cluster1
-      - name: KUBECONFIG
-        value: /root/.kube/config
-      - name: DOCKER_CONFIG
-        value: /opt/cluster
-      image: us-docker.pkg.dev/knative-tests/images/prow-tests:v20240704-35a1eee1c
-      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
-      - mountPath: /opt/cluster
-        name: s390x-cluster1
-        readOnly: true
-    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
-    - name: s390x-cluster1
-      secret:
-        defaultMode: 384
-        secretName: s390x-cluster1
-- annotations:
-    testgrid-dashboards: knative-release-1.13
-    testgrid-tab-name: serving-ppc64le-kourier-tests
-  cluster: prow-build
-  cron: 20 10 * * *
-  decorate: true
-  extra_refs:
-  - base_ref: release-1.13
-    org: knative
-    path_alias: knative.dev/serving
-    repo: serving
-  name: ppc64le-kourier-tests_serving_release-1.13_periodic
-  spec:
-    containers:
-    - args:
-      - bash
-      - -c
-      - |
-        server_vm="$(sh /opt/cluster/vm-script)"
-        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
-        export TEST_OPTIONS=$TEST_OPTIONS' --ingressendpoint '${server_vm}
-        ./test/e2e-tests.sh --run-tests --kourier-version latest
-      command:
-      - runner.sh
-      env:
-      - name: CI_JOB
-        value: kourier-release-1.13
-      - name: SYSTEM_NAMESPACE
-        value: knative-serving
-      - name: TEST_OPTIONS
-        value: --enable-alpha --enable-beta --resolvabledomain=false
-      - name: DOCKER_IN_DOCKER_ENABLED
-        value: "true"
-      - name: KO_FLAGS
-        value: --platform=linux/ppc64le
-      - name: PLATFORM
-        value: linux/ppc64le
-      - name: KO_DOCKER_REPO
-        value: icr.io/upstream-k8s-registry/knative
-      - name: KUBECONFIG
-        value: /root/.kube/config
-      - name: DOCKER_CONFIG
-        value: /opt/cluster
-      image: us-docker.pkg.dev/knative-tests/images/prow-tests:v20240704-35a1eee1c
-      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
-      - mountPath: /opt/cluster
-        name: ppc64le-cluster
-        readOnly: true
-    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
-    - name: ppc64le-cluster
-      secret:
-        defaultMode: 384
-        secretName: ppc64le-cluster
-- annotations:
-    testgrid-dashboards: knative-release-1.13
+    testgrid-dashboards: knative-release-1.15
     testgrid-tab-name: serving-release
   cluster: prow-build
-  cron: 45 9 * * 2
+  cron: 15 9 * * 2
   decorate: true
   decoration_config:
     timeout: 3h0m0s
   extra_refs:
-  - base_ref: release-1.13
+  - base_ref: release-1.15
     org: knative
     path_alias: knative.dev/serving
     repo: serving
   max_concurrency: 1
-  name: release_serving_release-1.13_periodic
+  name: release_serving_release-1.15_periodic
   spec:
     containers:
     - command:
@@ -343,7 +88,7 @@ periodics:
       - --github-token
       - /etc/hub-token/token
       - --branch
-      - release-1.13
+      - release-1.15
       env:
       - name: DOCKER_IN_DOCKER_ENABLED
         value: "true"
@@ -401,10 +146,10 @@ presubmits:
   knative/serving:
   - always_run: true
     branches:
-    - ^release-1.13$
+    - ^release-1.15$
     cluster: prow-build
     decorate: true
-    name: build-tests_serving_release-1.13
+    name: build-tests_serving_release-1.15
     path_alias: knative.dev/serving
     rerun_command: /test build-tests
     spec:
@@ -446,13 +191,13 @@ presubmits:
           path: /sys/fs/cgroup
           type: Directory
         name: cgroup
-    trigger: ((?m)^/test( | .* )build-tests,?($|\s.*))|((?m)^/test( | .* )build-tests_serving_release-1.13,?($|\s.*))
+    trigger: ((?m)^/test( | .* )build-tests,?($|\s.*))|((?m)^/test( | .* )build-tests_serving_release-1.15,?($|\s.*))
   - always_run: true
     branches:
-    - ^release-1.13$
+    - ^release-1.15$
     cluster: prow-build
     decorate: true
-    name: unit-tests_serving_release-1.13
+    name: unit-tests_serving_release-1.15
     path_alias: knative.dev/serving
     rerun_command: /test unit-tests
     spec:
@@ -494,13 +239,13 @@ presubmits:
           path: /sys/fs/cgroup
           type: Directory
         name: cgroup
-    trigger: ((?m)^/test( | .* )unit-tests,?($|\s.*))|((?m)^/test( | .* )unit-tests_serving_release-1.13,?($|\s.*))
+    trigger: ((?m)^/test( | .* )unit-tests,?($|\s.*))|((?m)^/test( | .* )unit-tests_serving_release-1.15,?($|\s.*))
   - always_run: true
     branches:
-    - ^release-1.13$
+    - ^release-1.15$
     cluster: prow-build
     decorate: true
-    name: upgrade-tests_serving_release-1.13
+    name: upgrade-tests_serving_release-1.15
     path_alias: knative.dev/serving
     rerun_command: /test upgrade-tests
     spec:
@@ -544,13 +289,13 @@ presubmits:
           path: /sys/fs/cgroup
           type: Directory
         name: cgroup
-    trigger: ((?m)^/test( | .* )upgrade-tests,?($|\s.*))|((?m)^/test( | .* )upgrade-tests_serving_release-1.13,?($|\s.*))
+    trigger: ((?m)^/test( | .* )upgrade-tests,?($|\s.*))|((?m)^/test( | .* )upgrade-tests_serving_release-1.15,?($|\s.*))
   - always_run: true
     branches:
-    - ^release-1.13$
+    - ^release-1.15$
     cluster: prow-build
     decorate: true
-    name: istio-latest-no-mesh_serving_release-1.13
+    name: istio-latest-no-mesh_serving_release-1.15
     path_alias: knative.dev/serving
     rerun_command: /test istio-latest-no-mesh
     spec:
@@ -595,13 +340,13 @@ presubmits:
           type: Directory
         name: cgroup
     trigger: ((?m)^/test( | .* )istio-latest-no-mesh,?($|\s.*))|((?m)^/test( | .*
-      )istio-latest-no-mesh_serving_release-1.13,?($|\s.*))
+      )istio-latest-no-mesh_serving_release-1.15,?($|\s.*))
   - always_run: true
     branches:
-    - ^release-1.13$
+    - ^release-1.15$
     cluster: prow-build
     decorate: true
-    name: istio-latest-no-mesh-tls_serving_release-1.13
+    name: istio-latest-no-mesh-tls_serving_release-1.15
     path_alias: knative.dev/serving
     rerun_command: /test istio-latest-no-mesh-tls
     spec:
@@ -646,15 +391,15 @@ presubmits:
           type: Directory
         name: cgroup
     trigger: ((?m)^/test( | .* )istio-latest-no-mesh-tls,?($|\s.*))|((?m)^/test( |
-      .* )istio-latest-no-mesh-tls_serving_release-1.13,?($|\s.*))
+      .* )istio-latest-no-mesh-tls_serving_release-1.15,?($|\s.*))
   - always_run: false
     branches:
-    - ^release-1.13$
+    - ^release-1.15$
     cluster: prow-build
     decorate: true
     decoration_config:
       timeout: 3h0m0s
-    name: performance-tests_serving_release-1.13
+    name: performance-tests_serving_release-1.15
     optional: true
     path_alias: knative.dev/serving
     rerun_command: /test performance-tests
@@ -713,13 +458,13 @@ presubmits:
         secret:
           defaultMode: 384
           secretName: influx-url-secret
-    trigger: ((?m)^/test( | .* )performance-tests,?($|\s.*))|((?m)^/test( | .* )performance-tests_serving_release-1.13,?($|\s.*))
+    trigger: ((?m)^/test( | .* )performance-tests,?($|\s.*))|((?m)^/test( | .* )performance-tests_serving_release-1.15,?($|\s.*))
   - always_run: false
     branches:
-    - ^release-1.13$
+    - ^release-1.15$
     cluster: prow-build
     decorate: true
-    name: istio-latest-mesh_serving_release-1.13
+    name: istio-latest-mesh_serving_release-1.15
     optional: true
     path_alias: knative.dev/serving
     rerun_command: /test istio-latest-mesh
@@ -764,13 +509,13 @@ presubmits:
           path: /sys/fs/cgroup
           type: Directory
         name: cgroup
-    trigger: ((?m)^/test( | .* )istio-latest-mesh,?($|\s.*))|((?m)^/test( | .* )istio-latest-mesh_serving_release-1.13,?($|\s.*))
+    trigger: ((?m)^/test( | .* )istio-latest-mesh,?($|\s.*))|((?m)^/test( | .* )istio-latest-mesh_serving_release-1.15,?($|\s.*))
   - always_run: false
     branches:
-    - ^release-1.13$
+    - ^release-1.15$
     cluster: prow-build
     decorate: true
-    name: istio-latest-mesh-short_serving_release-1.13
+    name: istio-latest-mesh-short_serving_release-1.15
     optional: true
     path_alias: knative.dev/serving
     rerun_command: /test istio-latest-mesh-short
@@ -816,13 +561,13 @@ presubmits:
           type: Directory
         name: cgroup
     trigger: ((?m)^/test( | .* )istio-latest-mesh-short,?($|\s.*))|((?m)^/test( |
-      .* )istio-latest-mesh-short_serving_release-1.13,?($|\s.*))
+      .* )istio-latest-mesh-short_serving_release-1.15,?($|\s.*))
   - always_run: false
     branches:
-    - ^release-1.13$
+    - ^release-1.15$
     cluster: prow-build
     decorate: true
-    name: istio-latest-mesh-tls_serving_release-1.13
+    name: istio-latest-mesh-tls_serving_release-1.15
     optional: true
     path_alias: knative.dev/serving
     rerun_command: /test istio-latest-mesh-tls
@@ -868,13 +613,13 @@ presubmits:
           type: Directory
         name: cgroup
     trigger: ((?m)^/test( | .* )istio-latest-mesh-tls,?($|\s.*))|((?m)^/test( | .*
-      )istio-latest-mesh-tls_serving_release-1.13,?($|\s.*))
+      )istio-latest-mesh-tls_serving_release-1.15,?($|\s.*))
   - always_run: false
     branches:
-    - ^release-1.13$
+    - ^release-1.15$
     cluster: prow-build
     decorate: true
-    name: kourier-stable_serving_release-1.13
+    name: kourier-stable_serving_release-1.15
     path_alias: knative.dev/serving
     rerun_command: /test kourier-stable
     run_if_changed: ^third_party/kourier-latest/*
@@ -919,13 +664,13 @@ presubmits:
           path: /sys/fs/cgroup
           type: Directory
         name: cgroup
-    trigger: ((?m)^/test( | .* )kourier-stable,?($|\s.*))|((?m)^/test( | .* )kourier-stable_serving_release-1.13,?($|\s.*))
+    trigger: ((?m)^/test( | .* )kourier-stable,?($|\s.*))|((?m)^/test( | .* )kourier-stable_serving_release-1.15,?($|\s.*))
   - always_run: false
     branches:
-    - ^release-1.13$
+    - ^release-1.15$
     cluster: prow-build
     decorate: true
-    name: kourier-stable-tls_serving_release-1.13
+    name: kourier-stable-tls_serving_release-1.15
     path_alias: knative.dev/serving
     rerun_command: /test kourier-stable-tls
     run_if_changed: ^third_party/kourier-latest/*
@@ -970,13 +715,13 @@ presubmits:
           path: /sys/fs/cgroup
           type: Directory
         name: cgroup
-    trigger: ((?m)^/test( | .* )kourier-stable-tls,?($|\s.*))|((?m)^/test( | .* )kourier-stable-tls_serving_release-1.13,?($|\s.*))
+    trigger: ((?m)^/test( | .* )kourier-stable-tls,?($|\s.*))|((?m)^/test( | .* )kourier-stable-tls_serving_release-1.15,?($|\s.*))
   - always_run: false
     branches:
-    - ^release-1.13$
+    - ^release-1.15$
     cluster: prow-build
     decorate: true
-    name: contour-latest_serving_release-1.13
+    name: contour-latest_serving_release-1.15
     path_alias: knative.dev/serving
     rerun_command: /test contour-latest
     run_if_changed: ^third_party/contour-latest/*
@@ -1021,13 +766,13 @@ presubmits:
           path: /sys/fs/cgroup
           type: Directory
         name: cgroup
-    trigger: ((?m)^/test( | .* )contour-latest,?($|\s.*))|((?m)^/test( | .* )contour-latest_serving_release-1.13,?($|\s.*))
+    trigger: ((?m)^/test( | .* )contour-latest,?($|\s.*))|((?m)^/test( | .* )contour-latest_serving_release-1.15,?($|\s.*))
   - always_run: false
     branches:
-    - ^release-1.13$
+    - ^release-1.15$
     cluster: prow-build
     decorate: true
-    name: contour-tls_serving_release-1.13
+    name: contour-tls_serving_release-1.15
     path_alias: knative.dev/serving
     rerun_command: /test contour-tls
     run_if_changed: ^third_party/contour-latest/*
@@ -1072,13 +817,13 @@ presubmits:
           path: /sys/fs/cgroup
           type: Directory
         name: cgroup
-    trigger: ((?m)^/test( | .* )contour-tls,?($|\s.*))|((?m)^/test( | .* )contour-tls_serving_release-1.13,?($|\s.*))
+    trigger: ((?m)^/test( | .* )contour-tls,?($|\s.*))|((?m)^/test( | .* )contour-tls_serving_release-1.15,?($|\s.*))
   - always_run: false
     branches:
-    - ^release-1.13$
+    - ^release-1.15$
     cluster: prow-build
     decorate: true
-    name: gateway-api-latest_serving_release-1.13
+    name: gateway-api-latest_serving_release-1.15
     path_alias: knative.dev/serving
     rerun_command: /test gateway-api-latest
     run_if_changed: ^third_party/gateway-api-latest/*
@@ -1123,13 +868,67 @@ presubmits:
           path: /sys/fs/cgroup
           type: Directory
         name: cgroup
-    trigger: ((?m)^/test( | .* )gateway-api-latest,?($|\s.*))|((?m)^/test( | .* )gateway-api-latest_serving_release-1.13,?($|\s.*))
+    trigger: ((?m)^/test( | .* )gateway-api-latest,?($|\s.*))|((?m)^/test( | .* )gateway-api-latest_serving_release-1.15,?($|\s.*))
+  - always_run: false
+    branches:
+    - ^release-1.15$
+    cluster: prow-build
+    decorate: true
+    name: gateway-api-latest-and-contour_serving_release-1.15
+    optional: true
+    path_alias: knative.dev/serving
+    rerun_command: /test gateway-api-latest-and-contour
+    run_if_changed: ^third_party/gateway-api-latest/*
+    spec:
+      containers:
+      - command:
+        - runner.sh
+        - ./test/presubmit-tests.sh
+        - --run-test
+        - ./test/e2e-tests.sh --gateway-api-version latest --gateway-api-implementation
+          contour
+        env:
+        - name: DOCKER_IN_DOCKER_ENABLED
+          value: "true"
+        image: us-docker.pkg.dev/knative-tests/images/prow-tests:v20240704-35a1eee1c
+        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( | .* )gateway-api-latest-and-contour,?($|\s.*))|((?m)^/test(
+      | .* )gateway-api-latest-and-contour_serving_release-1.15,?($|\s.*))
   - always_run: false
     branches:
-    - ^release-1.13$
+    - ^release-1.15$
     cluster: prow-build
     decorate: true
-    name: https_serving_release-1.13
+    name: https_serving_release-1.15
     optional: true
     path_alias: knative.dev/serving
     rerun_command: /test https
@@ -1178,4 +977,4 @@ presubmits:
           path: /sys/fs/cgroup
           type: Directory
         name: cgroup
-    trigger: ((?m)^/test( | .* )https,?($|\s.*))|((?m)^/test( | .* )https_serving_release-1.13,?($|\s.*))
+    trigger: ((?m)^/test( | .* )https,?($|\s.*))|((?m)^/test( | .* )https_serving_release-1.15,?($|\s.*))
diff --git a/prow/jobs_config/knative-extensions/net-contour-release-1.13.yaml b/prow/jobs_config/knative-extensions/net-contour-release-1.15.yaml
similarity index 97%
rename from prow/jobs_config/knative-extensions/net-contour-release-1.13.yaml
rename to prow/jobs_config/knative-extensions/net-contour-release-1.15.yaml
index 25d009b21..8c381ea50 100644
--- a/prow/jobs_config/knative-extensions/net-contour-release-1.13.yaml
+++ b/prow/jobs_config/knative-extensions/net-contour-release-1.15.yaml
@@ -5,7 +5,7 @@
 # ####                                                                     ####
 # #############################################################################
 branches:
-- release-1.13
+- release-1.15
 image: us-docker.pkg.dev/knative-tests/images/prow-tests:v20240704-35a1eee1c
 jobs:
 - command:
@@ -51,7 +51,7 @@ jobs:
   - --github-token
   - /etc/hub-token/token
   - --branch
-  - release-1.13
+  - release-1.15
   excluded_requirements:
   - gcp
   max_concurrency: 1
diff --git a/prow/jobs_config/knative/serving-release-1.13.yaml b/prow/jobs_config/knative/serving-release-1.15.yaml
similarity index 76%
rename from prow/jobs_config/knative/serving-release-1.13.yaml
rename to prow/jobs_config/knative/serving-release-1.15.yaml
index 527e26e97..cef80ca60 100644
--- a/prow/jobs_config/knative/serving-release-1.13.yaml
+++ b/prow/jobs_config/knative/serving-release-1.15.yaml
@@ -5,7 +5,7 @@
 # ####                                                                     ####
 # #############################################################################
 branches:
-- release-1.13
+- release-1.15
 image: us-docker.pkg.dev/knative-tests/images/prow-tests:v20240704-35a1eee1c
 jobs:
 - command:
@@ -153,6 +153,19 @@ jobs:
   regex: ^third_party/gateway-api-latest/*
   types:
   - presubmit
+- command:
+  - runner.sh
+  - ./test/presubmit-tests.sh
+  - --run-test
+  - ./test/e2e-tests.sh --gateway-api-version latest --gateway-api-implementation
+    contour
+  modifiers:
+  - presubmit_optional
+  - presubmit_skipped
+  name: gateway-api-latest-and-contour
+  regex: ^third_party/gateway-api-latest/*
+  types:
+  - presubmit
 - args:
   - ./test/presubmit-tests.sh
   - --run-test
@@ -176,81 +189,6 @@ jobs:
   timeout: 3h0m0s
   types:
   - periodic
-- args:
-  - bash
-  - -c
-  - |
-    mkdir -p /root/.kube
-    cat /opt/cluster/ci-script > connect.sh
-    chmod +x connect.sh
-    server_addr=$(./connect.sh kourier-113)
-    kubectl get cm s390x-config-serving -n default -o jsonpath='{.data.adjustment-script}' > adjust.sh
-    chmod +x adjust.sh
-    ./adjust.sh
-    export TEST_OPTIONS=$TEST_OPTIONS' --ingressendpoint '${server_addr}
-    ./test/e2e-tests.sh --run-tests --kourier-version latest
-  command:
-  - runner.sh
-  cron: 20 6 * * *
-  env:
-  - name: SYSTEM_NAMESPACE
-    value: knative-serving
-  - name: TEST_OPTIONS
-    value: --enable-alpha --enable-beta --resolvabledomain=false
-  name: s390x-kourier-tests
-  requirements:
-  - s390x
-  types:
-  - periodic
-- args:
-  - bash
-  - -c
-  - |
-    mkdir -p /root/.kube
-    cat /opt/cluster/ci-script > connect.sh
-    chmod +x connect.sh
-    server_addr=$(./connect.sh contour-113)
-    kubectl get cm s390x-config-serving -n default -o jsonpath='{.data.adjustment-script}' > adjust.sh
-    chmod +x adjust.sh
-    ./adjust.sh
-    export TEST_OPTIONS=$TEST_OPTIONS' --ingressendpoint '${server_addr}
-    ./test/e2e-tests.sh --run-tests --contour-version latest
-  command:
-  - runner.sh
-  cron: 20 7 * * *
-  env:
-  - name: SYSTEM_NAMESPACE
-    value: knative-serving
-  - name: TEST_OPTIONS
-    value: --enable-alpha --enable-beta --resolvabledomain=false
-  name: s390x-contour-tests
-  requirements:
-  - s390x
-  types:
-  - periodic
-- args:
-  - bash
-  - -c
-  - |
-    server_vm="$(sh /opt/cluster/vm-script)"
-    source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
-    export TEST_OPTIONS=$TEST_OPTIONS' --ingressendpoint '${server_vm}
-    ./test/e2e-tests.sh --run-tests --kourier-version latest
-  command:
-  - runner.sh
-  cron: 20 10 * * *
-  env:
-  - name: SYSTEM_NAMESPACE
-    value: knative-serving
-  - name: TEST_OPTIONS
-    value: --enable-alpha --enable-beta --resolvabledomain=false
-  - name: CI_JOB
-    value: kourier-release-1.13
-  name: ppc64le-kourier-tests
-  requirements:
-  - ppc64le
-  types:
-  - periodic
 - command:
   - runner.sh
   - ./hack/release.sh
@@ -262,7 +200,7 @@ jobs:
   - --github-token
   - /etc/hub-token/token
   - --branch
-  - release-1.13
+  - release-1.15
   excluded_requirements:
   - gcp
   max_concurrency: 1