From 5f6b32fae7443af3a0d91964418065210d631600 Mon Sep 17 00:00:00 2001 From: Kenjiro Nakayama Date: Wed, 7 Sep 2022 22:22:07 +0900 Subject: [PATCH 1/5] Bump internal TLS CI to 4.11 --- ...native-serving-release-next__411-tls.yaml} | 16 +-- ...tive-serving-release-next-postsubmits.yaml | 12 +-- ...ative-serving-release-next-presubmits.yaml | 98 +++++++++---------- 3 files changed, 63 insertions(+), 63 deletions(-) rename ci-operator/config/openshift/knative-serving/{openshift-knative-serving-release-next__410-tls.yaml => openshift-knative-serving-release-next__411-tls.yaml} (98%) diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__410-tls.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__411-tls.yaml similarity index 98% rename from ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__410-tls.yaml rename to ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__411-tls.yaml index 8ad6ba857f464..c4eaa8348fa26 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__410-tls.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__411-tls.yaml @@ -1,6 +1,6 @@ base_images: base: - name: "4.10" + name: "4.11" namespace: ocp tag: base binary_build_commands: make install @@ -226,12 +226,12 @@ promotion: releases: initial: integration: - name: "4.10" + name: "4.11" namespace: ocp latest: integration: include_built_images: true - name: "4.10" + name: "4.11" namespace: ocp resources: '*': @@ -248,14 +248,14 @@ resources: memory: 4Gi test_binary_build_commands: make test-install tests: -- as: e2e-aws-ocp-410 +- as: e2e-aws-ocp-411 cluster_claim: architecture: amd64 cloud: aws owner: openshift-ci product: ocp timeout: 1h0m0s - version: "4.10" + version: "4.11" steps: test: - as: test @@ -320,14 +320,14 @@ tests: cpu: 100m timeout: 4h0m0s workflow: generic-claim -- as: e2e-aws-ocp-410-continuous +- as: e2e-aws-ocp-411-continuous cluster_claim: architecture: amd64 cloud: aws owner: openshift-ci product: ocp timeout: 1h0m0s - version: "4.10" + version: "4.11" steps: test: - as: test @@ -396,4 +396,4 @@ zz_generated_metadata: branch: release-next org: openshift repo: knative-serving - variant: 410-tls + variant: 411-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 87f47235ea4a9..9e5f6ca1e7902 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 @@ -10,10 +10,10 @@ postsubmits: skip_cloning: true labels: ci-operator.openshift.io/is-promotion: "true" - ci-operator.openshift.io/variant: 410-tls + ci-operator.openshift.io/variant: "411" ci.openshift.io/generator: prowgen max_concurrency: 1 - name: branch-ci-openshift-knative-serving-release-next-410-tls-images + name: branch-ci-openshift-knative-serving-release-next-411-images path_alias: knative.dev/serving spec: containers: @@ -25,7 +25,7 @@ postsubmits: - --report-credentials-file=/etc/report/credentials - --target=[images] - --target=src - - --variant=410-tls + - --variant=411 command: - ci-operator image: ci-operator:latest @@ -68,10 +68,10 @@ postsubmits: skip_cloning: true labels: ci-operator.openshift.io/is-promotion: "true" - ci-operator.openshift.io/variant: "411" + ci-operator.openshift.io/variant: 411-tls ci.openshift.io/generator: prowgen max_concurrency: 1 - name: branch-ci-openshift-knative-serving-release-next-411-images + name: branch-ci-openshift-knative-serving-release-next-411-tls-images path_alias: knative.dev/serving spec: containers: @@ -83,7 +83,7 @@ postsubmits: - --report-credentials-file=/etc/report/credentials - --target=[images] - --target=src - - --variant=411 + - --variant=411-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 95b118c560f4d..8a3feeb898388 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 @@ -6,17 +6,17 @@ presubmits: - ^release-next$ - ^release-next- cluster: build03 - context: ci/prow/410-tls-e2e-aws-ocp-410 + context: ci/prow/411-e2e-aws-ocp-411 decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: 410-tls + ci-operator.openshift.io/variant: "411" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-410-tls-e2e-aws-ocp-410 + name: pull-ci-openshift-knative-serving-release-next-411-e2e-aws-ocp-411 path_alias: knative.dev/serving - rerun_command: /test 410-tls-e2e-aws-ocp-410 + rerun_command: /test 411-e2e-aws-ocp-411 spec: containers: - args: @@ -25,8 +25,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-410 - - --variant=410-tls + - --target=e2e-aws-ocp-411 + - --variant=411 command: - ci-operator image: ci-operator:latest @@ -65,34 +65,33 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )410-tls-e2e-aws-ocp-410,?($|\s.*) + trigger: (?m)^/test( | .* )411-e2e-aws-ocp-411,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-next$ - ^release-next- cluster: build03 - context: ci/prow/410-tls-e2e-aws-ocp-410-continuous + context: ci/prow/411-images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: 410-tls + ci-operator.openshift.io/variant: "411" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-410-tls-e2e-aws-ocp-410-continuous + name: pull-ci-openshift-knative-serving-release-next-411-images path_alias: knative.dev/serving - rerun_command: /test 410-tls-e2e-aws-ocp-410-continuous + rerun_command: /test 411-images 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-410-continuous - - --variant=410-tls + - --target=[images] + - --target=src + - --variant=411 command: - ci-operator image: ci-operator:latest @@ -102,15 +101,9 @@ presubmits: 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 @@ -119,45 +112,40 @@ presubmits: 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( | .* )410-tls-e2e-aws-ocp-410-continuous,?($|\s.*) + trigger: (?m)^/test( | .* )411-images,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-next$ - ^release-next- cluster: build03 - context: ci/prow/410-tls-images + context: ci/prow/411-tls-e2e-aws-ocp-411 decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: 410-tls + ci-operator.openshift.io/variant: 411-tls ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-410-tls-images + name: pull-ci-openshift-knative-serving-release-next-411-tls-e2e-aws-ocp-411 path_alias: knative.dev/serving - rerun_command: /test 410-tls-images + rerun_command: /test 411-tls-e2e-aws-ocp-411 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 - - --target=[images] - - --target=src - - --variant=410-tls + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-ocp-411 + - --variant=411-tls command: - ci-operator image: ci-operator:latest @@ -167,9 +155,15 @@ presubmits: 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 @@ -178,30 +172,36 @@ presubmits: 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( | .* )410-tls-images,?($|\s.*) + trigger: (?m)^/test( | .* )411-tls-e2e-aws-ocp-411,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-next$ - ^release-next- cluster: build03 - context: ci/prow/411-e2e-aws-ocp-411 + context: ci/prow/411-tls-e2e-aws-ocp-411-continuous decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: "411" + ci-operator.openshift.io/variant: 411-tls ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-411-e2e-aws-ocp-411 + name: pull-ci-openshift-knative-serving-release-next-411-tls-e2e-aws-ocp-411-continuous path_alias: knative.dev/serving - rerun_command: /test 411-e2e-aws-ocp-411 + rerun_command: /test 411-tls-e2e-aws-ocp-411-continuous spec: containers: - args: @@ -210,8 +210,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-411 - - --variant=411 + - --target=e2e-aws-ocp-411-continuous + - --variant=411-tls command: - ci-operator image: ci-operator:latest @@ -250,24 +250,24 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )411-e2e-aws-ocp-411,?($|\s.*) + trigger: (?m)^/test( | .* )411-tls-e2e-aws-ocp-411-continuous,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-next$ - ^release-next- cluster: build03 - context: ci/prow/411-images + context: ci/prow/411-tls-images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: "411" + ci-operator.openshift.io/variant: 411-tls ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-411-images + name: pull-ci-openshift-knative-serving-release-next-411-tls-images path_alias: knative.dev/serving - rerun_command: /test 411-images + rerun_command: /test 411-tls-images spec: containers: - args: @@ -276,7 +276,7 @@ presubmits: - --report-credentials-file=/etc/report/credentials - --target=[images] - --target=src - - --variant=411 + - --variant=411-tls command: - ci-operator image: ci-operator:latest @@ -303,7 +303,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )411-images,?($|\s.*) + trigger: (?m)^/test( | .* )411-tls-images,?($|\s.*) - agent: kubernetes always_run: true branches: From 7051eef4ec2cf552e6b98aa0ee9ac76f73d06b6f Mon Sep 17 00:00:00 2001 From: Kenjiro Nakayama Date: Thu, 8 Sep 2022 08:50:25 +0900 Subject: [PATCH 2/5] use shorter name --- ...ft-knative-serving-release-next__tls.yaml} | 2 +- ...tive-serving-release-next-postsubmits.yaml | 18 +- ...ative-serving-release-next-presubmits.yaml | 156 +++++++++--------- 3 files changed, 88 insertions(+), 88 deletions(-) rename ci-operator/config/openshift/knative-serving/{openshift-knative-serving-release-next__411-tls.yaml => openshift-knative-serving-release-next__tls.yaml} (99%) diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__411-tls.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__tls.yaml similarity index 99% rename from ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__411-tls.yaml rename to ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__tls.yaml index c4eaa8348fa26..e6fb7bb16e5ad 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__411-tls.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__tls.yaml @@ -396,4 +396,4 @@ zz_generated_metadata: branch: release-next org: openshift repo: knative-serving - variant: 411-tls + variant: 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 9e5f6ca1e7902..b02da569df16d 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 @@ -68,10 +68,10 @@ postsubmits: skip_cloning: true labels: ci-operator.openshift.io/is-promotion: "true" - ci-operator.openshift.io/variant: 411-tls + ci-operator.openshift.io/variant: "46" ci.openshift.io/generator: prowgen max_concurrency: 1 - name: branch-ci-openshift-knative-serving-release-next-411-tls-images + name: branch-ci-openshift-knative-serving-release-next-46-images path_alias: knative.dev/serving spec: containers: @@ -83,7 +83,7 @@ postsubmits: - --report-credentials-file=/etc/report/credentials - --target=[images] - --target=src - - --variant=411-tls + - --variant=46 command: - ci-operator image: ci-operator:latest @@ -126,10 +126,10 @@ postsubmits: skip_cloning: true labels: ci-operator.openshift.io/is-promotion: "true" - ci-operator.openshift.io/variant: "46" + ci-operator.openshift.io/variant: "47" ci.openshift.io/generator: prowgen max_concurrency: 1 - name: branch-ci-openshift-knative-serving-release-next-46-images + name: branch-ci-openshift-knative-serving-release-next-47-images path_alias: knative.dev/serving spec: containers: @@ -141,7 +141,7 @@ postsubmits: - --report-credentials-file=/etc/report/credentials - --target=[images] - --target=src - - --variant=46 + - --variant=47 command: - ci-operator image: ci-operator:latest @@ -184,10 +184,10 @@ postsubmits: skip_cloning: true labels: ci-operator.openshift.io/is-promotion: "true" - ci-operator.openshift.io/variant: "47" + ci-operator.openshift.io/variant: tls ci.openshift.io/generator: prowgen max_concurrency: 1 - name: branch-ci-openshift-knative-serving-release-next-47-images + name: branch-ci-openshift-knative-serving-release-next-tls-images path_alias: knative.dev/serving spec: containers: @@ -199,7 +199,7 @@ postsubmits: - --report-credentials-file=/etc/report/credentials - --target=[images] - --target=src - - --variant=47 + - --variant=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 8a3feeb898388..a3e9d526560dc 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 @@ -125,17 +125,17 @@ presubmits: - ^release-next$ - ^release-next- cluster: build03 - context: ci/prow/411-tls-e2e-aws-ocp-411 + context: ci/prow/46-e2e-aws-ocp-46 decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: 411-tls + ci-operator.openshift.io/variant: "46" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-411-tls-e2e-aws-ocp-411 + name: pull-ci-openshift-knative-serving-release-next-46-e2e-aws-ocp-46 path_alias: knative.dev/serving - rerun_command: /test 411-tls-e2e-aws-ocp-411 + rerun_command: /test 46-e2e-aws-ocp-46 spec: containers: - args: @@ -144,8 +144,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-411 - - --variant=411-tls + - --target=e2e-aws-ocp-46 + - --variant=46 command: - ci-operator image: ci-operator:latest @@ -184,34 +184,33 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )411-tls-e2e-aws-ocp-411,?($|\s.*) + trigger: (?m)^/test( | .* )46-e2e-aws-ocp-46,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-next$ - ^release-next- cluster: build03 - context: ci/prow/411-tls-e2e-aws-ocp-411-continuous + context: ci/prow/46-images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: 411-tls + ci-operator.openshift.io/variant: "46" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-411-tls-e2e-aws-ocp-411-continuous + name: pull-ci-openshift-knative-serving-release-next-46-images path_alias: knative.dev/serving - rerun_command: /test 411-tls-e2e-aws-ocp-411-continuous + rerun_command: /test 46-images 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-411-continuous - - --variant=411-tls + - --target=[images] + - --target=src + - --variant=46 command: - ci-operator image: ci-operator:latest @@ -221,15 +220,9 @@ presubmits: 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 @@ -238,45 +231,40 @@ presubmits: 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( | .* )411-tls-e2e-aws-ocp-411-continuous,?($|\s.*) + trigger: (?m)^/test( | .* )46-images,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-next$ - ^release-next- cluster: build03 - context: ci/prow/411-tls-images + context: ci/prow/47-e2e-aws-ocp-47 decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: 411-tls + ci-operator.openshift.io/variant: "47" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-411-tls-images + name: pull-ci-openshift-knative-serving-release-next-47-e2e-aws-ocp-47 path_alias: knative.dev/serving - rerun_command: /test 411-tls-images + rerun_command: /test 47-e2e-aws-ocp-47 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 - - --target=[images] - - --target=src - - --variant=411-tls + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-ocp-47 + - --variant=47 command: - ci-operator image: ci-operator:latest @@ -286,9 +274,15 @@ presubmits: 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 @@ -297,40 +291,45 @@ presubmits: 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( | .* )411-tls-images,?($|\s.*) + trigger: (?m)^/test( | .* )47-e2e-aws-ocp-47,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-next$ - ^release-next- cluster: build03 - context: ci/prow/46-e2e-aws-ocp-46 + context: ci/prow/47-images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: "46" + ci-operator.openshift.io/variant: "47" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-46-e2e-aws-ocp-46 + name: pull-ci-openshift-knative-serving-release-next-47-images path_alias: knative.dev/serving - rerun_command: /test 46-e2e-aws-ocp-46 + rerun_command: /test 47-images 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-46 - - --variant=46 + - --target=[images] + - --target=src + - --variant=47 command: - ci-operator image: ci-operator:latest @@ -340,15 +339,9 @@ presubmits: 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 @@ -357,45 +350,40 @@ presubmits: 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( | .* )46-e2e-aws-ocp-46,?($|\s.*) + trigger: (?m)^/test( | .* )47-images,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-next$ - ^release-next- cluster: build03 - context: ci/prow/46-images + context: ci/prow/tls-e2e-aws-ocp-411 decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: "46" + ci-operator.openshift.io/variant: tls ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-46-images + name: pull-ci-openshift-knative-serving-release-next-tls-e2e-aws-ocp-411 path_alias: knative.dev/serving - rerun_command: /test 46-images + rerun_command: /test tls-e2e-aws-ocp-411 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 - - --target=[images] - - --target=src - - --variant=46 + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-ocp-411 + - --variant=tls command: - ci-operator image: ci-operator:latest @@ -405,9 +393,15 @@ presubmits: 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 @@ -416,30 +410,36 @@ presubmits: 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( | .* )46-images,?($|\s.*) + trigger: (?m)^/test( | .* )tls-e2e-aws-ocp-411,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-next$ - ^release-next- cluster: build03 - context: ci/prow/47-e2e-aws-ocp-47 + context: ci/prow/tls-e2e-aws-ocp-411-continuous decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: "47" + ci-operator.openshift.io/variant: tls ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-47-e2e-aws-ocp-47 + name: pull-ci-openshift-knative-serving-release-next-tls-e2e-aws-ocp-411-continuous path_alias: knative.dev/serving - rerun_command: /test 47-e2e-aws-ocp-47 + rerun_command: /test tls-e2e-aws-ocp-411-continuous spec: containers: - args: @@ -448,8 +448,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-47 - - --variant=47 + - --target=e2e-aws-ocp-411-continuous + - --variant=tls command: - ci-operator image: ci-operator:latest @@ -488,24 +488,24 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )47-e2e-aws-ocp-47,?($|\s.*) + trigger: (?m)^/test( | .* )tls-e2e-aws-ocp-411-continuous,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-next$ - ^release-next- cluster: build03 - context: ci/prow/47-images + context: ci/prow/tls-images decorate: true decoration_config: skip_cloning: true labels: - ci-operator.openshift.io/variant: "47" + ci-operator.openshift.io/variant: tls ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-47-images + name: pull-ci-openshift-knative-serving-release-next-tls-images path_alias: knative.dev/serving - rerun_command: /test 47-images + rerun_command: /test tls-images spec: containers: - args: @@ -514,7 +514,7 @@ presubmits: - --report-credentials-file=/etc/report/credentials - --target=[images] - --target=src - - --variant=47 + - --variant=tls command: - ci-operator image: ci-operator:latest @@ -541,4 +541,4 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )47-images,?($|\s.*) + trigger: (?m)^/test( | .* )tls-images,?($|\s.*) From d301f01d16e5e0ae5bbb32989b62587eedd56be5 Mon Sep 17 00:00:00 2001 From: Kenjiro Nakayama Date: Thu, 8 Sep 2022 13:06:06 +0900 Subject: [PATCH 3/5] Drop -continours suffix from tls --- .../openshift-knative-serving-release-next__tls.yaml | 2 +- ...nshift-knative-serving-release-next-presubmits.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__tls.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__tls.yaml index e6fb7bb16e5ad..b0a0552dbbb61 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__tls.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__tls.yaml @@ -320,7 +320,7 @@ tests: cpu: 100m timeout: 4h0m0s workflow: generic-claim -- as: e2e-aws-ocp-411-continuous +- as: e2e-aws-ocp-tls-411 cluster_claim: architecture: amd64 cloud: aws 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 a3e9d526560dc..e3f57dc64d76d 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 @@ -429,7 +429,7 @@ presubmits: - ^release-next$ - ^release-next- cluster: build03 - context: ci/prow/tls-e2e-aws-ocp-411-continuous + context: ci/prow/tls-e2e-aws-ocp-tls-411 decorate: true decoration_config: skip_cloning: true @@ -437,9 +437,9 @@ presubmits: ci-operator.openshift.io/variant: tls ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-tls-e2e-aws-ocp-411-continuous + name: pull-ci-openshift-knative-serving-release-next-tls-e2e-aws-ocp-tls-411 path_alias: knative.dev/serving - rerun_command: /test tls-e2e-aws-ocp-411-continuous + rerun_command: /test tls-e2e-aws-ocp-tls-411 spec: containers: - args: @@ -448,7 +448,7 @@ 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-411-continuous + - --target=e2e-aws-ocp-tls-411 - --variant=tls command: - ci-operator @@ -488,7 +488,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )tls-e2e-aws-ocp-411-continuous,?($|\s.*) + trigger: (?m)^/test( | .* )tls-e2e-aws-ocp-tls-411,?($|\s.*) - agent: kubernetes always_run: true branches: From 325b8dde5c4b9756e5701d395cf1bce5a3cef66f Mon Sep 17 00:00:00 2001 From: Kenjiro Nakayama Date: Thu, 8 Sep 2022 15:38:07 +0900 Subject: [PATCH 4/5] Drop __tls.yaml --- ...ift-knative-serving-release-next__411.yaml | 72 ++++ ...ift-knative-serving-release-next__tls.yaml | 399 ------------------ ...ative-serving-release-next-presubmits.yaml | 66 +++ 3 files changed, 138 insertions(+), 399 deletions(-) delete mode 100644 ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__tls.yaml diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__411.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__411.yaml index c18a0272ab650..8b74bb4e8d44d 100644 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__411.yaml +++ b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__411.yaml @@ -319,6 +319,78 @@ tests: cpu: 100m timeout: 4h0m0s workflow: generic-claim +- as: e2e-aws-ocp-tls-411 + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.11" + steps: + test: + - as: test + cli: latest + commands: make test-e2e-tls + dependencies: + - env: KNATIVE_SERVING_ACTIVATOR + name: knative-serving-activator + - env: KNATIVE_SERVING_AUTOSCALER + name: knative-serving-autoscaler + - 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_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_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 diff --git a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__tls.yaml b/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__tls.yaml deleted file mode 100644 index b0a0552dbbb61..0000000000000 --- a/ci-operator/config/openshift/knative-serving/openshift-knative-serving-release-next__tls.yaml +++ /dev/null @@ -1,399 +0,0 @@ -base_images: - base: - name: "4.11" - 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/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/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/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/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/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-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/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/webhook/Dockerfile - from: base - inputs: - bin: - paths: - - destination_dir: . - 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/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/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/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/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/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/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/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/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/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/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/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/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/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/volumes/Dockerfile - from: base - inputs: - test-bin: - paths: - - destination_dir: . - 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/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.11" - namespace: ocp - latest: - integration: - include_built_images: true - name: "4.11" - namespace: ocp -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 500m - memory: 4Gi - bin: - limits: - memory: 4Gi - requests: - cpu: 500m - memory: 4Gi -test_binary_build_commands: make test-install -tests: -- as: e2e-aws-ocp-411 - cluster_claim: - architecture: amd64 - cloud: aws - owner: openshift-ci - product: ocp - timeout: 1h0m0s - version: "4.11" - steps: - test: - - as: test - cli: latest - commands: make test-e2e - dependencies: - - env: KNATIVE_SERVING_ACTIVATOR - name: knative-serving-activator - - env: KNATIVE_SERVING_AUTOSCALER - name: knative-serving-autoscaler - - 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_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_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 -- as: e2e-aws-ocp-tls-411 - cluster_claim: - architecture: amd64 - cloud: aws - owner: openshift-ci - product: ocp - timeout: 1h0m0s - version: "4.11" - steps: - test: - - as: test - cli: latest - commands: make test-e2e-tls - dependencies: - - env: KNATIVE_SERVING_ACTIVATOR - name: knative-serving-activator - - env: KNATIVE_SERVING_AUTOSCALER - name: knative-serving-autoscaler - - 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_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_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: tls 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 e3f57dc64d76d..e70a70facff84 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 @@ -66,6 +66,72 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )411-e2e-aws-ocp-411,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-next$ + - ^release-next- + cluster: build03 + context: ci/prow/411-e2e-aws-ocp-tls-411 + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/variant: "411" + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-knative-serving-release-next-411-e2e-aws-ocp-tls-411 + path_alias: knative.dev/serving + rerun_command: /test 411-e2e-aws-ocp-tls-411 + 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-tls-411 + - --variant=411 + 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( | .* )411-e2e-aws-ocp-tls-411,?($|\s.*) - agent: kubernetes always_run: true branches: From 4d1060ffcefd38275804f7f637a32496e3630ad9 Mon Sep 17 00:00:00 2001 From: Kenjiro Nakayama Date: Thu, 8 Sep 2022 15:49:09 +0900 Subject: [PATCH 5/5] Run make jobs --- ...tive-serving-release-next-postsubmits.yaml | 58 ------ ...ative-serving-release-next-presubmits.yaml | 185 ------------------ 2 files changed, 243 deletions(-) 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 b02da569df16d..5556cd6e88fe7 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 @@ -174,61 +174,3 @@ postsubmits: - 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: tls - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-openshift-knative-serving-release-next-tls-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] - - --target=src - - --variant=tls - 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 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 e70a70facff84..df01497f765c6 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 @@ -423,188 +423,3 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )47-images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-next$ - - ^release-next- - cluster: build03 - context: ci/prow/tls-e2e-aws-ocp-411 - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/variant: tls - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-tls-e2e-aws-ocp-411 - path_alias: knative.dev/serving - rerun_command: /test tls-e2e-aws-ocp-411 - 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-411 - - --variant=tls - 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( | .* )tls-e2e-aws-ocp-411,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-next$ - - ^release-next- - cluster: build03 - context: ci/prow/tls-e2e-aws-ocp-tls-411 - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/variant: tls - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-tls-e2e-aws-ocp-tls-411 - path_alias: knative.dev/serving - rerun_command: /test tls-e2e-aws-ocp-tls-411 - 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-tls-411 - - --variant=tls - 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( | .* )tls-e2e-aws-ocp-tls-411,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^release-next$ - - ^release-next- - cluster: build03 - context: ci/prow/tls-images - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/variant: tls - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serving-release-next-tls-images - path_alias: knative.dev/serving - rerun_command: /test tls-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] - - --target=src - - --variant=tls - 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( | .* )tls-images,?($|\s.*)