diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.10.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.10.yaml index 5d65c0c8a638b..33c964f5d0859 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.10.yaml +++ b/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,7 +253,7 @@ tests: cloud: aws owner: openshift-ci product: ocp - timeout: 2h0m0s + timeout: 1h0m0s version: "4.10" steps: test: @@ -251,62 +261,63 @@ tests: 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 diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.6.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.6.yaml index f82b99532648f..f1df76c62fb8b 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.6.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.6.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 disabled: true name: knative-nightly namespace: openshift @@ -233,76 +235,91 @@ 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-46 + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.6" steps: - cluster_profile: aws 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 - workflow: ipi-aws + timeout: 4h0m0s + workflow: generic-claim zz_generated_metadata: branch: release-next org: openshift diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.7.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.7.yaml index 6ec43084fa621..3b6e5609fa485 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.7.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.7.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 disabled: true name: knative-nightly namespace: openshift @@ -233,76 +235,91 @@ 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-47 + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.7" steps: - cluster_profile: aws 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 - workflow: ipi-aws + timeout: 4h0m0s + workflow: generic-claim zz_generated_metadata: branch: release-next org: openshift diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.9.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.9.yaml deleted file mode 100644 index 09208b0d476fd..0000000000000 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.9.yaml +++ /dev/null @@ -1,316 +0,0 @@ -base_images: - base: - name: "4.9" - namespace: ocp - tag: base -binary_build_commands: make install -build_root: - project_image: - 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: - bin: - paths: - - destination_dir: . - source_path: /go/bin/activator - to: knative-serving-activator -- dockerfile_path: openshift/ci-operator/knative-images/controller/Dockerfile - from: base - inputs: - bin: - paths: - - destination_dir: . - source_path: /go/bin/controller - to: knative-serving-controller -- dockerfile_path: openshift/ci-operator/knative-images/autoscaler-hpa/Dockerfile - from: base - inputs: - bin: - paths: - - destination_dir: . - source_path: /go/bin/autoscaler-hpa - to: knative-serving-autoscaler-hpa -- dockerfile_path: openshift/ci-operator/knative-images/queue/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 - from: base - inputs: - bin: - paths: - - destination_dir: . - source_path: /go/bin/autoscaler - to: knative-serving-autoscaler -- dockerfile_path: openshift/ci-operator/knative-images/migrate/Dockerfile - from: base - inputs: - bin: - paths: - - destination_dir: . - source_path: /go/bin/migrate - to: knative-serving-storage-version-migration -- dockerfile_path: openshift/ci-operator/knative-images/domain-mapping/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 - 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 - 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 - 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 - 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 - 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 - 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 - 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 - from: base - inputs: - test-bin: - paths: - - destination_dir: . - source_path: /go/bin/autoscale - to: knative-serving-test-autoscale -- dockerfile_path: openshift/ci-operator/knative-test-images/pizzaplanetv1/Dockerfile - from: base - inputs: - test-bin: - paths: - - destination_dir: . - source_path: /go/bin/pizzaplanetv1 - to: knative-serving-test-pizzaplanetv1 -- dockerfile_path: openshift/ci-operator/knative-test-images/wsserver/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 - 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 - from: base - inputs: - test-bin: - paths: - - destination_dir: . - source_path: /go/bin/singlethreaded - to: knative-serving-test-singlethreaded -- dockerfile_path: openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile - from: base - inputs: - test-bin: - paths: - - destination_dir: . - source_path: /go/bin/servingcontainer - to: knative-serving-test-servingcontainer -- dockerfile_path: openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile - from: base - inputs: - test-bin: - paths: - - destination_dir: . - source_path: /go/bin/sidecarcontainer - to: knative-serving-test-sidecarcontainer -- dockerfile_path: openshift/ci-operator/knative-test-images/hellohttp2/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 - 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 - 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 - from: base - inputs: - test-bin: - paths: - - destination_dir: . - source_path: /go/bin/volumes - to: knative-serving-test-volumes -promotion: - disabled: true - name: knative-nightly - namespace: openshift -releases: - initial: - integration: - name: "4.9" - namespace: ocp - latest: - integration: - include_built_images: true - name: "4.9" - namespace: ocp -resources: - '*': - requests: - cpu: 100m - memory: 200Mi -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-49 - cluster_claim: - architecture: amd64 - cloud: aws - owner: openshift-ci - product: ocp - timeout: 2h0m0s - version: "4.9" - 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_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_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_HELLOHTTP2 - name: knative-serving-test-hellohttp2 - - env: KNATIVE_SERVING_TEST_HELLOVOLUME - name: knative-serving-test-hellovolume - - env: KNATIVE_SERVING_TEST_READINESS - name: knative-serving-test-readiness - - env: KNATIVE_SERVING_TEST_VOLUMES - name: knative-serving-test-volumes - from: src - resources: - requests: - cpu: 100m - workflow: generic-claim -zz_generated_metadata: - branch: release-next - org: openshift - repo: knative-serving - variant: "4.9" diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.8.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__410-tls.yaml similarity index 96% rename from ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.8.yaml rename to ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__410-tls.yaml index 41f04a9e8f874..0cac0b464622e 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__4.8.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__410-tls.yaml @@ -1,6 +1,6 @@ base_images: base: - name: "4.8" + name: "4.10" namespace: ocp tag: base binary_build_commands: make install @@ -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,132 +185,143 @@ 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 disabled: true name: knative-nightly namespace: openshift releases: initial: integration: - name: "4.8" + name: "4.10" namespace: ocp latest: integration: include_built_images: true - name: "4.8" + name: "4.10" 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-48 +- as: e2e-aws-ocp-410 cluster_claim: architecture: amd64 cloud: aws owner: openshift-ci product: ocp - timeout: 2h0m0s - version: "4.8" + 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 org: openshift repo: knative-serving - variant: "4.8" + variant: 410-tls diff --git a/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-next-postsubmits.yaml b/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-next-postsubmits.yaml index 1f67db8b42cad..31e8383b939d4 100644 --- a/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-next-postsubmits.yaml +++ b/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-next-postsubmits.yaml @@ -24,6 +24,7 @@ postsubmits: - --promote - --report-credentials-file=/etc/report/credentials - --target=[images] + - --target=src - --variant=4.10 command: - ci-operator @@ -81,6 +82,7 @@ postsubmits: - --promote - --report-credentials-file=/etc/report/credentials - --target=[images] + - --target=src - --variant=4.6 command: - ci-operator @@ -138,6 +140,7 @@ postsubmits: - --promote - --report-credentials-file=/etc/report/credentials - --target=[images] + - --target=src - --variant=4.7 command: - ci-operator @@ -181,10 +184,10 @@ postsubmits: skip_cloning: true labels: ci-operator.openshift.io/is-promotion: "true" - ci-operator.openshift.io/variant: "4.8" + ci-operator.openshift.io/variant: 410-tls ci.openshift.io/generator: prowgen max_concurrency: 1 - name: branch-ci-openshift-knative-serving-release-next-4.8-images + name: branch-ci-openshift-knative-serving-release-next-410-tls-images path_alias: knative.dev/serving spec: containers: @@ -195,64 +198,8 @@ postsubmits: - --promote - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=4.8 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/push-secret - name: push-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: push-secret - secret: - secretName: registry-push-credentials-ci-central - - name: result-aggregator - secret: - secretName: result-aggregator - - agent: kubernetes - always_run: true - branches: - - ^release-next$ - cluster: build02 - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/is-promotion: "true" - ci-operator.openshift.io/variant: "4.9" - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-openshift-knative-serving-release-next-4.9-images - path_alias: knative.dev/serving - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson - - --promote - - --report-credentials-file=/etc/report/credentials - - --target=[images] - - --variant=4.9 + - --target=src + - --variant=410-tls command: - ci-operator image: ci-operator:latest diff --git a/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-next-presubmits.yaml b/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-next-presubmits.yaml index 137d2837b706b..f9f940a863666 100644 --- a/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-next-presubmits.yaml +++ b/ci-operator/jobs/openshift/knative-serving/openshift-knative-serving-release-next-presubmits.yaml @@ -90,6 +90,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] + - --target=src - --variant=4.10 command: - ci-operator @@ -129,8 +130,6 @@ presubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: "4.6" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -141,11 +140,10 @@ presubmits: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json + - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-ocp-46-cluster-profile - --target=e2e-aws-ocp-46 - --variant=4.6 command: @@ -157,17 +155,15 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-ocp-46-cluster-profile - name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials readOnly: true + - mountPath: /secrets/hive-hive-credentials + name: hive-hive-credentials + readOnly: true - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -176,18 +172,12 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: cluster-profile + - name: hive-hive-credentials secret: - secretName: cluster-secrets-aws + secretName: hive-hive-credentials - name: pull-secret secret: secretName: registry-pull-credentials @@ -219,6 +209,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] + - --target=src - --variant=4.6 command: - ci-operator @@ -258,8 +249,6 @@ presubmits: decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws ci-operator.openshift.io/variant: "4.7" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" @@ -270,11 +259,10 @@ presubmits: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json + - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-aws-ocp-47-cluster-profile - --target=e2e-aws-ocp-47 - --variant=4.7 command: @@ -286,17 +274,15 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-ocp-47-cluster-profile - name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials readOnly: true + - mountPath: /secrets/hive-hive-credentials + name: hive-hive-credentials + readOnly: true - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -305,18 +291,12 @@ presubmits: readOnly: true serviceAccountName: ci-operator volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - name: ci-pull-credentials secret: secretName: ci-pull-credentials - - name: cluster-profile + - name: hive-hive-credentials secret: - secretName: cluster-secrets-aws + secretName: hive-hive-credentials - name: pull-secret secret: secretName: registry-pull-credentials @@ -348,6 +328,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] + - --target=src - --variant=4.7 command: - ci-operator @@ -382,135 +363,17 @@ presubmits: - ^release-next$ - ^release-next- cluster: build03 - context: ci/prow/4.8-e2e-aws-ocp-48 - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/variant: "4.8" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-4.8-e2e-aws-ocp-48 - path_alias: knative.dev/serving - rerun_command: /test 4.8-e2e-aws-ocp-48 - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --hive-kubeconfig=/secrets/hive-hive-credentials/kubeconfig - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-ocp-48 - - --variant=4.8 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/hive-hive-credentials - name: hive-hive-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: hive-hive-credentials - secret: - secretName: hive-hive-credentials - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )4.8-e2e-aws-ocp-48,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-next$ - - ^release-next- - cluster: build03 - context: ci/prow/4.8-images + context: ci/prow/410-tls-e2e-aws-ocp-410 decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: "4.8" + ci-operator.openshift.io/variant: 410-tls ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-4.8-images + name: pull-ci-openshift-knative-serving-release-next-410-tls-e2e-aws-ocp-410 path_alias: knative.dev/serving - rerun_command: /test 4.8-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=[images] - - --variant=4.8 - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )4.8-images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-next$ - - ^release-next- - cluster: build03 - context: ci/prow/4.9-e2e-aws-ocp-49 - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/variant: "4.9" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-4.9-e2e-aws-ocp-49 - path_alias: knative.dev/serving - rerun_command: /test 4.9-e2e-aws-ocp-49 + rerun_command: /test 410-tls-e2e-aws-ocp-410 spec: containers: - args: @@ -519,8 +382,8 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-ocp-49 - - --variant=4.9 + - --target=e2e-aws-ocp-410 + - --variant=410-tls command: - ci-operator image: ci-operator:latest @@ -559,24 +422,24 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.9-e2e-aws-ocp-49,?($|\s.*) + trigger: (?m)^/test( | .* )410-tls-e2e-aws-ocp-410,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-next$ - ^release-next- cluster: build03 - context: ci/prow/4.9-images + context: ci/prow/410-tls-images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: "4.9" + ci-operator.openshift.io/variant: 410-tls ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-4.9-images + name: pull-ci-openshift-knative-serving-release-next-410-tls-images path_alias: knative.dev/serving - rerun_command: /test 4.9-images + rerun_command: /test 410-tls-images spec: containers: - args: @@ -584,7 +447,8 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=4.9 + - --target=src + - --variant=410-tls command: - ci-operator image: ci-operator:latest @@ -611,4 +475,4 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.9-images,?($|\s.*) + trigger: (?m)^/test( | .* )410-tls-images,?($|\s.*)