Add 4.10-tls and drop 4.8, 4.9 from serving next

ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.10.yaml

@@ -9,14 +9,6 @@ build_root:
     dockerfile_path: openshift/ci-operator/build-image/Dockerfile
 canonical_go_repository: knative.dev/serving
 images:
-- dockerfile_path: openshift/ci-operator/knative-images/webhook/Dockerfile
-  from: base
-  inputs:
-    bin:
-      paths:
-      - destination_dir: .
-        source_path: /go/bin/webhook
-  to: knative-serving-webhook
 - dockerfile_path: openshift/ci-operator/knative-images/activator/Dockerfile
   from: base
   inputs:
@@ -25,14 +17,14 @@ images:
       - destination_dir: .
         source_path: /go/bin/activator
   to: knative-serving-activator
-- dockerfile_path: openshift/ci-operator/knative-images/controller/Dockerfile
+- dockerfile_path: openshift/ci-operator/knative-images/autoscaler/Dockerfile
   from: base
   inputs:
     bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/controller
-  to: knative-serving-controller
+        source_path: /go/bin/autoscaler
+  to: knative-serving-autoscaler
 - dockerfile_path: openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile
   from: base
   inputs:
@@ -41,22 +33,30 @@ images:
       - destination_dir: .
         source_path: /go/bin/autoscaler-hpa
   to: knative-serving-autoscaler-hpa
-- dockerfile_path: openshift/ci-operator/knative-images/queue/Dockerfile
+- dockerfile_path: openshift/ci-operator/knative-images/controller/Dockerfile
   from: base
   inputs:
     bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/queue
-  to: knative-serving-queue
-- dockerfile_path: openshift/ci-operator/knative-images/autoscaler/Dockerfile
+        source_path: /go/bin/controller
+  to: knative-serving-controller
+- dockerfile_path: openshift/ci-operator/knative-images/domain-mapping/Dockerfile
   from: base
   inputs:
     bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/autoscaler
-  to: knative-serving-autoscaler
+        source_path: /go/bin/domain-mapping
+  to: knative-serving-domain-mapping
+- dockerfile_path: openshift/ci-operator/knative-images/domain-mapping-webhook/Dockerfile
+  from: base
+  inputs:
+    bin:
+      paths:
+      - destination_dir: .
+        source_path: /go/bin/domain-mapping-webhook
+  to: knative-serving-domain-mapping-webhook
 - dockerfile_path: openshift/ci-operator/knative-images/migrate/Dockerfile
   from: base
   inputs:
@@ -65,78 +65,78 @@ images:
       - destination_dir: .
         source_path: /go/bin/migrate
   to: knative-serving-storage-version-migration
-- dockerfile_path: openshift/ci-operator/knative-images/domain-mapping/Dockerfile
+- dockerfile_path: openshift/ci-operator/knative-images/queue/Dockerfile
   from: base
   inputs:
     bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/domain-mapping
-  to: knative-serving-domain-mapping
-- dockerfile_path: openshift/ci-operator/knative-images/domain-mapping-webhook/Dockerfile
+        source_path: /go/bin/queue
+  to: knative-serving-queue
+- dockerfile_path: openshift/ci-operator/knative-images/webhook/Dockerfile
   from: base
   inputs:
     bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/domain-mapping-webhook
-  to: knative-serving-domain-mapping-webhook
-- dockerfile_path: openshift/ci-operator/knative-test-images/pizzaplanetv2/Dockerfile
+        source_path: /go/bin/webhook
+  to: knative-serving-webhook
+- dockerfile_path: openshift/ci-operator/knative-test-images/autoscale/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/pizzaplanetv2
-  to: knative-serving-test-pizzaplanetv2
-- dockerfile_path: openshift/ci-operator/knative-test-images/helloworld/Dockerfile
+        source_path: /go/bin/autoscale
+  to: knative-serving-test-autoscale
+- dockerfile_path: openshift/ci-operator/knative-test-images/failing/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/helloworld
-  to: knative-serving-test-helloworld
-- dockerfile_path: openshift/ci-operator/knative-test-images/runtime/Dockerfile
+        source_path: /go/bin/failing
+  to: knative-serving-test-failing
+- dockerfile_path: openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/runtime
-  to: knative-serving-test-runtime
-- dockerfile_path: openshift/ci-operator/knative-test-images/timeout/Dockerfile
+        source_path: /go/bin/grpc-ping
+  to: knative-serving-test-grpc-ping
+- dockerfile_path: openshift/ci-operator/knative-test-images/hellohttp2/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/timeout
-  to: knative-serving-test-timeout
-- dockerfile_path: openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile
+        source_path: /go/bin/hellohttp2
+  to: knative-serving-test-hellohttp2
+- dockerfile_path: openshift/ci-operator/knative-test-images/hellovolume/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/grpc-ping
-  to: knative-serving-test-grpc-ping
-- dockerfile_path: openshift/ci-operator/knative-test-images/failing/Dockerfile
+        source_path: /go/bin/hellovolume
+  to: knative-serving-test-hellovolume
+- dockerfile_path: openshift/ci-operator/knative-test-images/helloworld/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/failing
-  to: knative-serving-test-failing
-- dockerfile_path: openshift/ci-operator/knative-test-images/autoscale/Dockerfile
+        source_path: /go/bin/helloworld
+  to: knative-serving-test-helloworld
+- dockerfile_path: openshift/ci-operator/knative-test-images/httpproxy/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/autoscale
-  to: knative-serving-test-autoscale
+        source_path: /go/bin/httpproxy
+  to: knative-serving-test-httpproxy
 - dockerfile_path: openshift/ci-operator/knative-test-images/pizzaplanetv1/Dockerfile
   from: base
   inputs:
@@ -145,30 +145,30 @@ images:
       - destination_dir: .
         source_path: /go/bin/pizzaplanetv1
   to: knative-serving-test-pizzaplanetv1
-- dockerfile_path: openshift/ci-operator/knative-test-images/wsserver/Dockerfile
+- dockerfile_path: openshift/ci-operator/knative-test-images/pizzaplanetv2/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/wsserver
-  to: knative-serving-test-wsserver
-- dockerfile_path: openshift/ci-operator/knative-test-images/httpproxy/Dockerfile
+        source_path: /go/bin/pizzaplanetv2
+  to: knative-serving-test-pizzaplanetv2
+- dockerfile_path: openshift/ci-operator/knative-test-images/readiness/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/httpproxy
-  to: knative-serving-test-httpproxy
-- dockerfile_path: openshift/ci-operator/knative-test-images/singlethreaded/Dockerfile
+        source_path: /go/bin/readiness
+  to: knative-serving-test-readiness
+- dockerfile_path: openshift/ci-operator/knative-test-images/runtime/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/singlethreaded
-  to: knative-serving-test-singlethreaded
+        source_path: /go/bin/runtime
+  to: knative-serving-test-runtime
 - dockerfile_path: openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile
   from: base
   inputs:
@@ -185,39 +185,41 @@ images:
       - destination_dir: .
         source_path: /go/bin/sidecarcontainer
   to: knative-serving-test-sidecarcontainer
-- dockerfile_path: openshift/ci-operator/knative-test-images/hellohttp2/Dockerfile
+- dockerfile_path: openshift/ci-operator/knative-test-images/singlethreaded/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/hellohttp2
-  to: knative-serving-test-hellohttp2
-- dockerfile_path: openshift/ci-operator/knative-test-images/hellovolume/Dockerfile
+        source_path: /go/bin/singlethreaded
+  to: knative-serving-test-singlethreaded
+- dockerfile_path: openshift/ci-operator/knative-test-images/timeout/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/hellovolume
-  to: knative-serving-test-hellovolume
-- dockerfile_path: openshift/ci-operator/knative-test-images/readiness/Dockerfile
+        source_path: /go/bin/timeout
+  to: knative-serving-test-timeout
+- dockerfile_path: openshift/ci-operator/knative-test-images/volumes/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/readiness
-  to: knative-serving-test-readiness
-- dockerfile_path: openshift/ci-operator/knative-test-images/volumes/Dockerfile
+        source_path: /go/bin/volumes
+  to: knative-serving-test-volumes
+- dockerfile_path: openshift/ci-operator/knative-test-images/wsserver/Dockerfile
   from: base
   inputs:
     test-bin:
       paths:
       - destination_dir: .
-        source_path: /go/bin/volumes
-  to: knative-serving-test-volumes
+        source_path: /go/bin/wsserver
+  to: knative-serving-test-wsserver
 promotion:
+  additional_images:
+    knative-serving-src: src
   name: knative-nightly
   namespace: openshift
 releases:
@@ -232,9 +234,17 @@ releases:
       namespace: ocp
 resources:
   '*':
+    limits:
+      memory: 4Gi
+    requests:
+      cpu: 500m
+      memory: 4Gi
+  bin:
+    limits:
+      memory: 4Gi
     requests:
-      cpu: 100m
-      memory: 200Mi
+      cpu: 500m
+      memory: 4Gi
 test_binary_build_commands: make test-install
 tests:
 - as: e2e-aws-ocp-410
@@ -243,70 +253,71 @@ tests:
     cloud: aws
     owner: openshift-ci
     product: ocp
-    timeout: 2h0m0s
+    timeout: 1h0m0s
     version: "4.10"
   steps:
     test:
     - as: test
       cli: latest
       commands: make test-e2e
       dependencies:
-      - env: KNATIVE_SERVING_WEBHOOK
-        name: knative-serving-webhook
       - env: KNATIVE_SERVING_ACTIVATOR
         name: knative-serving-activator
-      - env: KNATIVE_SERVING_CONTROLLER
-        name: knative-serving-controller
-      - env: KNATIVE_SERVING_AUTOSCALER_HPA
-        name: knative-serving-autoscaler-hpa
-      - env: KNATIVE_SERVING_QUEUE
-        name: knative-serving-queue
       - env: KNATIVE_SERVING_AUTOSCALER
         name: knative-serving-autoscaler
-      - env: KNATIVE_SERVING_STORAGE_VERSION_MIGRATION
-        name: knative-serving-storage-version-migration
+      - env: KNATIVE_SERVING_AUTOSCALER_HPA
+        name: knative-serving-autoscaler-hpa
+      - env: KNATIVE_SERVING_CONTROLLER
+        name: knative-serving-controller
       - env: KNATIVE_SERVING_DOMAIN_MAPPING
         name: knative-serving-domain-mapping
       - env: KNATIVE_SERVING_DOMAIN_MAPPING_WEBHOOK
         name: knative-serving-domain-mapping-webhook
-      - env: KNATIVE_SERVING_TEST_PIZZAPLANETV2
-        name: knative-serving-test-pizzaplanetv2
-      - env: KNATIVE_SERVING_TEST_HELLOWORLD
-        name: knative-serving-test-helloworld
-      - env: KNATIVE_SERVING_TEST_RUNTIME
-        name: knative-serving-test-runtime
-      - env: KNATIVE_SERVING_TEST_TIMEOUT
-        name: knative-serving-test-timeout
-      - env: KNATIVE_SERVING_TEST_GRPC_PING
-        name: knative-serving-test-grpc-ping
-      - env: KNATIVE_SERVING_TEST_FAILING
-        name: knative-serving-test-failing
+      - env: KNATIVE_SERVING_STORAGE_VERSION_MIGRATION
+        name: knative-serving-storage-version-migration
+      - env: KNATIVE_SERVING_QUEUE
+        name: knative-serving-queue
+      - env: KNATIVE_SERVING_WEBHOOK
+        name: knative-serving-webhook
       - env: KNATIVE_SERVING_TEST_AUTOSCALE
         name: knative-serving-test-autoscale
-      - env: KNATIVE_SERVING_TEST_PIZZAPLANETV1
-        name: knative-serving-test-pizzaplanetv1
-      - env: KNATIVE_SERVING_TEST_WSSERVER
-        name: knative-serving-test-wsserver
-      - env: KNATIVE_SERVING_TEST_HTTPPROXY
-        name: knative-serving-test-httpproxy
-      - env: KNATIVE_SERVING_TEST_SINGLETHREADED
-        name: knative-serving-test-singlethreaded
-      - env: KNATIVE_SERVING_TEST_SERVINGCONTAINER
-        name: knative-serving-test-servingcontainer
-      - env: KNATIVE_SERVING_TEST_SIDECARCONTAINER
-        name: knative-serving-test-sidecarcontainer
+      - env: KNATIVE_SERVING_TEST_FAILING
+        name: knative-serving-test-failing
+      - env: KNATIVE_SERVING_TEST_GRPC_PING
+        name: knative-serving-test-grpc-ping
       - env: KNATIVE_SERVING_TEST_HELLOHTTP2
         name: knative-serving-test-hellohttp2
       - env: KNATIVE_SERVING_TEST_HELLOVOLUME
         name: knative-serving-test-hellovolume
+      - env: KNATIVE_SERVING_TEST_HELLOWORLD
+        name: knative-serving-test-helloworld
+      - env: KNATIVE_SERVING_TEST_HTTPPROXY
+        name: knative-serving-test-httpproxy
+      - env: KNATIVE_SERVING_TEST_PIZZAPLANETV1
+        name: knative-serving-test-pizzaplanetv1
+      - env: KNATIVE_SERVING_TEST_PIZZAPLANETV2
+        name: knative-serving-test-pizzaplanetv2
       - env: KNATIVE_SERVING_TEST_READINESS
         name: knative-serving-test-readiness
+      - env: KNATIVE_SERVING_TEST_RUNTIME
+        name: knative-serving-test-runtime
+      - env: KNATIVE_SERVING_TEST_SERVINGCONTAINER
+        name: knative-serving-test-servingcontainer
+      - env: KNATIVE_SERVING_TEST_SIDECARCONTAINER
+        name: knative-serving-test-sidecarcontainer
+      - env: KNATIVE_SERVING_TEST_SINGLETHREADED
+        name: knative-serving-test-singlethreaded
+      - env: KNATIVE_SERVING_TEST_TIMEOUT
+        name: knative-serving-test-timeout
       - env: KNATIVE_SERVING_TEST_VOLUMES
         name: knative-serving-test-volumes
+      - env: KNATIVE_SERVING_TEST_WSSERVER
+        name: knative-serving-test-wsserver
       from: src
       resources:
         requests:
           cpu: 100m
+      timeout: 4h0m0s
     workflow: generic-claim
 zz_generated_metadata:
   branch: release-next