diff --git a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.6.yaml b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.6.yaml index baefb6b368be5..3ffce73f8e006 100644 --- a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.6.yaml +++ b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.6.yaml @@ -185,7 +185,7 @@ resources: memory: 200Mi tests: - as: e2e-aws-ocp-46-continuous - cron: 0 */12 * * 1-5 + cron: 0 */12 * * * steps: cluster_profile: aws test: @@ -207,7 +207,7 @@ tests: memory: 200Mi workflow: openshift-e2e-aws - as: upgrade-tests-aws-ocp-46-continuous - cron: 0 */12 * * 1-5 + cron: 0 */12 * * * steps: cluster_profile: aws test: diff --git a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7.yaml b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7.yaml index fe258881ccd6e..afba2b70964c5 100644 --- a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7.yaml +++ b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7.yaml @@ -168,6 +168,7 @@ images: from: base to: serverless-stop-bundle promotion: + disabled: true name: openshift-serverless-nightly namespace: openshift releases: @@ -183,52 +184,8 @@ resources: cpu: 100m memory: 200Mi tests: -- as: operator-e2e-aws-ocp-47 - steps: - allow_skip_on_success: true - cluster_profile: aws - test: - - as: operator-e2e - commands: make test-e2e-with-kafka - dependencies: - - env: KNATIVE_OPENSHIFT_INGRESS - name: knative-openshift-ingress - - env: KNATIVE_OPERATOR - name: knative-operator - - env: OPENSHIFT_KNATIVE_OPERATOR - name: openshift-knative-operator - from: serverless-operator-src - resources: - limits: - memory: 6Gi - requests: - cpu: 100m - memory: 200Mi - workflow: openshift-e2e-aws -- as: upstream-e2e-aws-ocp-47 - steps: - allow_skip_on_success: true - cluster_profile: aws - test: - - as: serverless-e2e - commands: make test-upstream-e2e-no-upgrade - dependencies: - - env: KNATIVE_OPENSHIFT_INGRESS - name: knative-openshift-ingress - - env: KNATIVE_OPERATOR - name: knative-operator - - env: OPENSHIFT_KNATIVE_OPERATOR - name: openshift-knative-operator - from: serverless-operator-src - resources: - limits: - memory: 6Gi - requests: - cpu: 100m - memory: 200Mi - workflow: openshift-e2e-aws - as: e2e-aws-ocp-47-continuous - cron: 0 */12 * * 1-5 + cron: 0 */12 * * * steps: cluster_profile: aws test: @@ -250,7 +207,7 @@ tests: memory: 200Mi workflow: openshift-e2e-aws - as: upgrade-tests-aws-ocp-47-continuous - cron: 0 */12 * * 1-5 + cron: 0 */12 * * * steps: cluster_profile: aws test: @@ -271,30 +228,8 @@ tests: cpu: "2" memory: 4Gi workflow: openshift-e2e-aws -- as: upgrade-tests-aws-ocp-47 - steps: - allow_skip_on_success: true - cluster_profile: aws - test: - - as: serverless-e2e - commands: make test-upgrade - dependencies: - - env: KNATIVE_OPENSHIFT_INGRESS - name: knative-openshift-ingress - - env: KNATIVE_OPERATOR - name: knative-operator - - env: OPENSHIFT_KNATIVE_OPERATOR - name: openshift-knative-operator - from: serverless-operator-src - resources: - limits: - memory: 6Gi - requests: - cpu: "2" - memory: 4Gi - workflow: openshift-e2e-aws - as: e2e-mesh-ocp-47-continuous - cron: 0 */12 * * 1-5 + cron: 0 */12 * * * steps: cluster_profile: aws test: @@ -315,28 +250,6 @@ tests: cpu: 100m memory: 200Mi workflow: openshift-e2e-aws -- as: upstream-e2e-mesh-aws-ocp-47 - steps: - allow_skip_on_success: true - cluster_profile: aws - test: - - as: serverless-e2e - commands: make test-upstream-e2e-mesh - dependencies: - - env: KNATIVE_OPENSHIFT_INGRESS - name: knative-openshift-ingress - - env: KNATIVE_OPERATOR - name: knative-operator - - env: OPENSHIFT_KNATIVE_OPERATOR - name: openshift-knative-operator - from: serverless-operator-src - resources: - limits: - memory: 6Gi - requests: - cpu: "2" - memory: 4Gi - workflow: openshift-e2e-aws zz_generated_metadata: branch: main org: openshift-knative diff --git a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7-aws-ovn.yaml b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8-aws-ovn.yaml similarity index 98% rename from ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7-aws-ovn.yaml rename to ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8-aws-ovn.yaml index 5fca62d50d6b2..0828580b723bb 100644 --- a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7-aws-ovn.yaml +++ b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8-aws-ovn.yaml @@ -1,10 +1,10 @@ base_images: base: - name: "4.7" + name: "4.8" namespace: ocp tag: base cli: - name: "4.7" + name: "4.8" namespace: ocp tag: cli openshift_knative-v0.15.2_knative-eventing-src: @@ -175,7 +175,7 @@ releases: latest: release: channel: stable - version: "4.7" + version: "4.8" resources: '*': limits: @@ -184,7 +184,7 @@ resources: cpu: 100m memory: 200Mi tests: -- as: e2e-aws-ovn-ocp-47-continuous +- as: e2e-aws-ovn-ocp-48-continuous cron: 0 0 * * 0 steps: cluster_profile: aws @@ -210,4 +210,4 @@ zz_generated_metadata: branch: main org: openshift-knative repo: serverless-operator - variant: 4.7-aws-ovn + variant: 4.8-aws-ovn diff --git a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7-azure.yaml b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8-azure.yaml similarity index 98% rename from ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7-azure.yaml rename to ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8-azure.yaml index 1b5bc466657d8..a9314e71519e5 100644 --- a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7-azure.yaml +++ b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8-azure.yaml @@ -1,10 +1,10 @@ base_images: base: - name: "4.7" + name: "4.8" namespace: ocp tag: base cli: - name: "4.7" + name: "4.8" namespace: ocp tag: cli openshift_knative-v0.15.2_knative-eventing-src: @@ -175,7 +175,7 @@ releases: latest: release: channel: stable - version: "4.7" + version: "4.8" resources: '*': limits: @@ -184,7 +184,7 @@ resources: cpu: 100m memory: 200Mi tests: -- as: e2e-azure-ocp-47-continuous +- as: e2e-azure-ocp-48-continuous cron: 0 0 * * 0 steps: cluster_profile: azure4 @@ -210,4 +210,4 @@ zz_generated_metadata: branch: main org: openshift-knative repo: serverless-operator - variant: 4.7-azure + variant: 4.8-azure diff --git a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7-gcp.yaml b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8-gcp.yaml similarity index 98% rename from ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7-gcp.yaml rename to ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8-gcp.yaml index 5fe9fd7752f04..349b73150e262 100644 --- a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7-gcp.yaml +++ b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8-gcp.yaml @@ -1,10 +1,10 @@ base_images: base: - name: "4.7" + name: "4.8" namespace: ocp tag: base cli: - name: "4.7" + name: "4.8" namespace: ocp tag: cli openshift_knative-v0.15.2_knative-eventing-src: @@ -120,7 +120,7 @@ base_images: namespace: openshift tag: golang-1.15 upi-installer: - name: "4.7" + name: "4.8" namespace: ocp tag: upi-installer build_root: @@ -179,7 +179,7 @@ releases: latest: release: channel: stable - version: "4.7" + version: "4.8" resources: '*': limits: @@ -188,7 +188,7 @@ resources: cpu: 100m memory: 200Mi tests: -- as: e2e-gcp-ocp-47-continuous +- as: e2e-gcp-ocp-48-continuous cron: 0 0 * * 0 steps: cluster_profile: gcp @@ -214,4 +214,4 @@ zz_generated_metadata: branch: main org: openshift-knative repo: serverless-operator - variant: 4.7-gcp + variant: 4.8-gcp diff --git a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7-vsphere.yaml b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8-vsphere.yaml similarity index 98% rename from ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7-vsphere.yaml rename to ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8-vsphere.yaml index 32d2af2a1edc6..db27c9536df7f 100644 --- a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.7-vsphere.yaml +++ b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8-vsphere.yaml @@ -1,10 +1,10 @@ base_images: base: - name: "4.7" + name: "4.8" namespace: ocp tag: base cli: - name: "4.7" + name: "4.8" namespace: ocp tag: cli openshift_knative-v0.15.2_knative-eventing-src: @@ -120,7 +120,7 @@ base_images: namespace: openshift tag: golang-1.15 upi-installer: - name: "4.7" + name: "4.8" namespace: ocp tag: upi-installer build_root: @@ -179,7 +179,7 @@ releases: latest: release: channel: stable - version: "4.7" + version: "4.8" resources: '*': limits: @@ -188,7 +188,7 @@ resources: cpu: 100m memory: 200Mi tests: -- as: e2e-vsphere-ocp-47-continuous +- as: e2e-vsphere-ocp-48-continuous cron: 0 0 * * 0 steps: cluster_profile: vsphere @@ -214,4 +214,4 @@ zz_generated_metadata: branch: main org: openshift-knative repo: serverless-operator - variant: 4.7-vsphere + variant: 4.8-vsphere diff --git a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8.yaml b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8.yaml index c3e097acf4fbf..4c5d903666f04 100644 --- a/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8.yaml +++ b/ci-operator/config/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main__4.8.yaml @@ -168,14 +168,12 @@ images: from: base to: serverless-stop-bundle promotion: - disabled: true name: openshift-serverless-nightly namespace: openshift releases: latest: - candidate: - product: ocp - stream: nightly + release: + channel: stable version: "4.8" resources: '*': @@ -185,10 +183,72 @@ resources: cpu: 100m memory: 200Mi tests: +- as: operator-e2e-aws-ocp-48 + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.8" + steps: + allow_skip_on_success: true + test: + - as: operator-e2e + commands: make test-e2e-with-kafka + dependencies: + - env: KNATIVE_OPENSHIFT_INGRESS + name: knative-openshift-ingress + - env: KNATIVE_OPERATOR + name: knative-operator + - env: OPENSHIFT_KNATIVE_OPERATOR + name: openshift-knative-operator + from: serverless-operator-src + resources: + limits: + memory: 6Gi + requests: + cpu: 100m + memory: 200Mi + workflow: generic-claim +- as: upstream-e2e-aws-ocp-48 + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.8" + steps: + allow_skip_on_success: true + test: + - as: serverless-e2e + commands: make test-upstream-e2e-no-upgrade + dependencies: + - env: KNATIVE_OPENSHIFT_INGRESS + name: knative-openshift-ingress + - env: KNATIVE_OPERATOR + name: knative-operator + - env: OPENSHIFT_KNATIVE_OPERATOR + name: openshift-knative-operator + from: serverless-operator-src + resources: + limits: + memory: 6Gi + requests: + cpu: 100m + memory: 200Mi + workflow: generic-claim - as: e2e-aws-ocp-48-continuous - cron: 0 */12 * * 1-5 + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.8" + cron: 0 */12 * * * steps: - cluster_profile: aws test: - as: serverless-e2e commands: make test-e2e-with-kafka test-upstream-e2e-no-upgrade test-ui-e2e @@ -206,11 +266,17 @@ tests: requests: cpu: 100m memory: 200Mi - workflow: openshift-e2e-aws + workflow: generic-claim - as: upgrade-tests-aws-ocp-48-continuous - cron: 0 */12 * * 1-5 + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.8" + cron: 0 */12 * * * steps: - cluster_profile: aws test: - as: serverless-e2e commands: make test-upgrade @@ -228,6 +294,78 @@ tests: requests: cpu: "2" memory: 4Gi + workflow: generic-claim +- as: upgrade-tests-aws-ocp-48 + cluster_claim: + architecture: amd64 + cloud: aws + owner: openshift-ci + product: ocp + timeout: 1h0m0s + version: "4.8" + steps: + allow_skip_on_success: true + test: + - as: serverless-e2e + commands: make test-upgrade + dependencies: + - env: KNATIVE_OPENSHIFT_INGRESS + name: knative-openshift-ingress + - env: KNATIVE_OPERATOR + name: knative-operator + - env: OPENSHIFT_KNATIVE_OPERATOR + name: openshift-knative-operator + from: serverless-operator-src + resources: + limits: + memory: 6Gi + requests: + cpu: "2" + memory: 4Gi + workflow: generic-claim +- as: e2e-mesh-ocp-48-continuous + cron: 0 */12 * * * + steps: + cluster_profile: aws + test: + - as: serverless-e2e + commands: make test-upstream-e2e-mesh + dependencies: + - env: KNATIVE_OPENSHIFT_INGRESS + name: knative-openshift-ingress + - env: KNATIVE_OPERATOR + name: knative-operator + - env: OPENSHIFT_KNATIVE_OPERATOR + name: openshift-knative-operator + from: serverless-operator-src + resources: + limits: + memory: 6Gi + requests: + cpu: 100m + memory: 200Mi + workflow: openshift-e2e-aws +- as: upstream-e2e-mesh-aws-ocp-48 + steps: + allow_skip_on_success: true + cluster_profile: aws + test: + - as: serverless-e2e + commands: make test-upstream-e2e-mesh + dependencies: + - env: KNATIVE_OPENSHIFT_INGRESS + name: knative-openshift-ingress + - env: KNATIVE_OPERATOR + name: knative-operator + - env: OPENSHIFT_KNATIVE_OPERATOR + name: openshift-knative-operator + from: serverless-operator-src + resources: + limits: + memory: 6Gi + requests: + cpu: "2" + memory: 4Gi workflow: openshift-e2e-aws zz_generated_metadata: branch: main diff --git a/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-periodics.yaml b/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-periodics.yaml index 3d78de85e9da4..802b0b44e4af5 100644 --- a/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-periodics.yaml +++ b/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-periodics.yaml @@ -1,7 +1,7 @@ periodics: - agent: kubernetes cluster: build01 - cron: 0 */12 * * 1-5 + cron: 0 */12 * * * decorate: true decoration_config: skip_cloning: true @@ -83,7 +83,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build01 - cron: 0 */12 * * 1-5 + cron: 0 */12 * * * decorate: true decoration_config: skip_cloning: true @@ -165,7 +165,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build01 - cron: 0 0 * * 0 + cron: 0 */12 * * * decorate: true decoration_config: skip_cloning: true @@ -175,9 +175,9 @@ periodics: repo: serverless-operator labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: 4.7-aws-ovn + ci-operator.openshift.io/variant: "4.7" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-knative-serverless-operator-main-4.7-aws-ovn-e2e-aws-ovn-ocp-47-continuous + name: periodic-ci-openshift-knative-serverless-operator-main-4.7-e2e-aws-ocp-47-continuous reporter_config: slack: channel: '#serverless-dev' @@ -194,9 +194,9 @@ periodics: - --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-ovn-ocp-47-continuous-cluster-profile - - --target=e2e-aws-ovn-ocp-47-continuous - - --variant=4.7-aws-ovn + - --secret-dir=/usr/local/e2e-aws-ocp-47-continuous-cluster-profile + - --target=e2e-aws-ocp-47-continuous + - --variant=4.7 command: - ci-operator image: ci-operator:latest @@ -212,7 +212,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-ovn-ocp-47-continuous-cluster-profile + - mountPath: /usr/local/e2e-aws-ocp-47-continuous-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -247,7 +247,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build01 - cron: 0 0 * * 0 + cron: 0 */12 * * * decorate: true decoration_config: skip_cloning: true @@ -257,14 +257,13 @@ periodics: repo: serverless-operator labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: 4.7-azure + ci-operator.openshift.io/variant: "4.7" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-knative-serverless-operator-main-4.7-azure-e2e-azure-ocp-47-continuous + name: periodic-ci-openshift-knative-serverless-operator-main-4.7-e2e-mesh-ocp-47-continuous reporter_config: slack: channel: '#serverless-dev' job_states_to_report: - - success - failure - error report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}* @@ -279,9 +278,9 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-azure-ocp-47-continuous-cluster-profile - - --target=e2e-azure-ocp-47-continuous - - --variant=4.7-azure + - --secret-dir=/usr/local/e2e-mesh-ocp-47-continuous-cluster-profile + - --target=e2e-mesh-ocp-47-continuous + - --variant=4.7 command: - ci-operator image: ci-operator:latest @@ -297,7 +296,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-azure-ocp-47-continuous-cluster-profile + - mountPath: /usr/local/e2e-mesh-ocp-47-continuous-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -323,7 +322,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-aws - name: pull-secret secret: secretName: registry-pull-credentials @@ -332,7 +331,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build01 - cron: 0 */12 * * 1-5 + cron: 0 */12 * * * decorate: true decoration_config: skip_cloning: true @@ -344,7 +343,7 @@ periodics: ci-operator.openshift.io/prowgen-controlled: "true" ci-operator.openshift.io/variant: "4.7" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-knative-serverless-operator-main-4.7-e2e-aws-ocp-47-continuous + name: periodic-ci-openshift-knative-serverless-operator-main-4.7-upgrade-tests-aws-ocp-47-continuous reporter_config: slack: channel: '#serverless-dev' @@ -361,8 +360,8 @@ periodics: - --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-continuous-cluster-profile - - --target=e2e-aws-ocp-47-continuous + - --secret-dir=/usr/local/upgrade-tests-aws-ocp-47-continuous-cluster-profile + - --target=upgrade-tests-aws-ocp-47-continuous - --variant=4.7 command: - ci-operator @@ -379,7 +378,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-ocp-47-continuous-cluster-profile + - mountPath: /usr/local/upgrade-tests-aws-ocp-47-continuous-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -414,7 +413,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build01 - cron: 0 */12 * * 1-5 + cron: 0 0 * * 0 decorate: true decoration_config: skip_cloning: true @@ -424,13 +423,14 @@ periodics: repo: serverless-operator labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: "4.7" + ci-operator.openshift.io/variant: 4.8-aws-ovn pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-knative-serverless-operator-main-4.7-e2e-mesh-ocp-47-continuous + name: periodic-ci-openshift-knative-serverless-operator-main-4.8-aws-ovn-e2e-aws-ovn-ocp-48-continuous reporter_config: slack: channel: '#serverless-dev' job_states_to_report: + - success - failure - error report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}* @@ -445,9 +445,9 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-mesh-ocp-47-continuous-cluster-profile - - --target=e2e-mesh-ocp-47-continuous - - --variant=4.7 + - --secret-dir=/usr/local/e2e-aws-ovn-ocp-48-continuous-cluster-profile + - --target=e2e-aws-ovn-ocp-48-continuous + - --variant=4.8-aws-ovn command: - ci-operator image: ci-operator:latest @@ -463,7 +463,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-mesh-ocp-47-continuous-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-ocp-48-continuous-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -508,9 +508,9 @@ periodics: repo: serverless-operator labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: 4.7-gcp + ci-operator.openshift.io/variant: 4.8-azure pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-knative-serverless-operator-main-4.7-gcp-e2e-gcp-ocp-47-continuous + name: periodic-ci-openshift-knative-serverless-operator-main-4.8-azure-e2e-azure-ocp-48-continuous reporter_config: slack: channel: '#serverless-dev' @@ -530,9 +530,9 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-gcp-ocp-47-continuous-cluster-profile - - --target=e2e-gcp-ocp-47-continuous - - --variant=4.7-gcp + - --secret-dir=/usr/local/e2e-azure-ocp-48-continuous-cluster-profile + - --target=e2e-azure-ocp-48-continuous + - --variant=4.8-azure command: - ci-operator image: ci-operator:latest @@ -548,7 +548,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-gcp-ocp-47-continuous-cluster-profile + - mountPath: /usr/local/e2e-azure-ocp-48-continuous-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -574,9 +574,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp + name: cluster-secrets-azure4 - name: pull-secret secret: secretName: registry-pull-credentials @@ -585,7 +583,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build01 - cron: 0 */12 * * 1-5 + cron: 0 */12 * * * decorate: true decoration_config: skip_cloning: true @@ -595,9 +593,80 @@ periodics: repo: serverless-operator labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: "4.7" + ci-operator.openshift.io/variant: "4.8" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-knative-serverless-operator-main-4.7-upgrade-tests-aws-ocp-47-continuous + name: periodic-ci-openshift-knative-serverless-operator-main-4.8-e2e-aws-ocp-48-continuous + reporter_config: + slack: + channel: '#serverless-dev' + job_states_to_report: + - failure + - error + report_template: ':volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. + <{{.Status.URL}}|View logs> :volcano:' + 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-continuous + - --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 +- agent: kubernetes + cluster: build01 + cron: 0 */12 * * * + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: main + org: openshift-knative + repo: serverless-operator + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: "4.8" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-knative-serverless-operator-main-4.8-e2e-mesh-ocp-48-continuous reporter_config: slack: channel: '#serverless-dev' @@ -614,9 +683,9 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/upgrade-tests-aws-ocp-47-continuous-cluster-profile - - --target=upgrade-tests-aws-ocp-47-continuous - - --variant=4.7 + - --secret-dir=/usr/local/e2e-mesh-ocp-48-continuous-cluster-profile + - --target=e2e-mesh-ocp-48-continuous + - --variant=4.8 command: - ci-operator image: ci-operator:latest @@ -632,7 +701,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/upgrade-tests-aws-ocp-47-continuous-cluster-profile + - mountPath: /usr/local/e2e-mesh-ocp-48-continuous-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -666,7 +735,7 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: vsphere + cluster: build01 cron: 0 0 * * 0 decorate: true decoration_config: @@ -677,9 +746,9 @@ periodics: repo: serverless-operator labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: 4.7-vsphere + ci-operator.openshift.io/variant: 4.8-gcp pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-knative-serverless-operator-main-4.7-vsphere-e2e-vsphere-ocp-47-continuous + name: periodic-ci-openshift-knative-serverless-operator-main-4.8-gcp-e2e-gcp-ocp-48-continuous reporter_config: slack: channel: '#serverless-dev' @@ -699,9 +768,9 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/e2e-vsphere-ocp-47-continuous-cluster-profile - - --target=e2e-vsphere-ocp-47-continuous - - --variant=4.7-vsphere + - --secret-dir=/usr/local/e2e-gcp-ocp-48-continuous-cluster-profile + - --target=e2e-gcp-ocp-48-continuous + - --variant=4.8-gcp command: - ci-operator image: ci-operator:latest @@ -717,7 +786,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-vsphere-ocp-47-continuous-cluster-profile + - mountPath: /usr/local/e2e-gcp-ocp-48-continuous-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -743,7 +812,9 @@ periodics: projected: sources: - secret: - name: cluster-secrets-vsphere + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials @@ -752,7 +823,7 @@ periodics: secretName: result-aggregator - agent: kubernetes cluster: build01 - cron: 0 */12 * * 1-5 + cron: 0 */12 * * * decorate: true decoration_config: skip_cloning: true @@ -763,9 +834,8 @@ periodics: labels: ci-operator.openshift.io/prowgen-controlled: "true" ci-operator.openshift.io/variant: "4.8" - job-release: "4.8" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-knative-serverless-operator-main-4.8-e2e-aws-ocp-48-continuous + name: periodic-ci-openshift-knative-serverless-operator-main-4.8-upgrade-tests-aws-ocp-48-continuous reporter_config: slack: channel: '#serverless-dev' @@ -778,12 +848,11 @@ periodics: 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-48-continuous-cluster-profile - - --target=e2e-aws-ocp-48-continuous + - --target=upgrade-tests-aws-ocp-48-continuous - --variant=4.8 command: - ci-operator @@ -794,17 +863,15 @@ periodics: 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-48-continuous-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 @@ -813,20 +880,12 @@ periodics: 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 - projected: - sources: - - secret: - name: cluster-secrets-aws + - name: hive-hive-credentials + secret: + secretName: hive-hive-credentials - name: pull-secret secret: secretName: registry-pull-credentials @@ -834,8 +893,8 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build01 - cron: 0 */12 * * 1-5 + cluster: vsphere + cron: 0 0 * * 0 decorate: true decoration_config: skip_cloning: true @@ -845,18 +904,20 @@ periodics: repo: serverless-operator labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: "4.8" - job-release: "4.8" + ci-operator.openshift.io/variant: 4.8-vsphere pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-knative-serverless-operator-main-4.8-upgrade-tests-aws-ocp-48-continuous + name: periodic-ci-openshift-knative-serverless-operator-main-4.8-vsphere-e2e-vsphere-ocp-48-continuous reporter_config: slack: channel: '#serverless-dev' job_states_to_report: + - success - failure - error - report_template: ':volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. - <{{.Status.URL}}|View logs> :volcano:' + report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}} + :volcano: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View + logs> :volcano: {{end}}' spec: containers: - args: @@ -865,9 +926,9 @@ periodics: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/upgrade-tests-aws-ocp-48-continuous-cluster-profile - - --target=upgrade-tests-aws-ocp-48-continuous - - --variant=4.8 + - --secret-dir=/usr/local/e2e-vsphere-ocp-48-continuous-cluster-profile + - --target=e2e-vsphere-ocp-48-continuous + - --variant=4.8-vsphere command: - ci-operator image: ci-operator:latest @@ -883,7 +944,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/upgrade-tests-aws-ocp-48-continuous-cluster-profile + - mountPath: /usr/local/e2e-vsphere-ocp-48-continuous-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials @@ -909,7 +970,7 @@ periodics: projected: sources: - secret: - name: cluster-secrets-aws + name: cluster-secrets-vsphere - name: pull-secret secret: secretName: registry-pull-credentials diff --git a/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-postsubmits.yaml b/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-postsubmits.yaml index c3dd173a6ccc4..d68d41b299ef9 100644 --- a/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-postsubmits.yaml +++ b/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-postsubmits.yaml @@ -121,7 +121,6 @@ postsubmits: ci-operator.openshift.io/is-promotion: "true" ci-operator.openshift.io/prowgen-controlled: "true" ci-operator.openshift.io/variant: "4.8" - job-release: "4.8" max_concurrency: 1 name: branch-ci-openshift-knative-serverless-operator-main-4.8-images spec: diff --git a/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-presubmits.yaml b/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-presubmits.yaml index dc4550f5d0cb7..98ed2c7243759 100644 --- a/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift-knative/serverless-operator/openshift-knative-serverless-operator-main-presubmits.yaml @@ -57,16 +57,16 @@ presubmits: - ^main$ - ^main- cluster: build01 - context: ci/prow/4.7-aws-ovn-images + context: ci/prow/4.7-images decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: 4.7-aws-ovn + ci-operator.openshift.io/variant: "4.7" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serverless-operator-main-4.7-aws-ovn-images - rerun_command: /test 4.7-aws-ovn-images + name: pull-ci-openshift-knative-serverless-operator-main-4.7-images + rerun_command: /test 4.7-images spec: containers: - args: @@ -74,7 +74,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=4.7-aws-ovn + - --variant=4.7 command: - ci-operator image: ci-operator:latest @@ -101,23 +101,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.7-aws-ovn-images,?($|\s.*) + trigger: (?m)^/test( | .* )4.7-images,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build01 - context: ci/prow/4.7-azure-images + context: ci/prow/4.8-aws-ovn-images decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: 4.7-azure + ci-operator.openshift.io/variant: 4.8-aws-ovn pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serverless-operator-main-4.7-azure-images - rerun_command: /test 4.7-azure-images + name: pull-ci-openshift-knative-serverless-operator-main-4.8-aws-ovn-images + rerun_command: /test 4.8-aws-ovn-images spec: containers: - args: @@ -125,7 +125,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=4.7-azure + - --variant=4.8-aws-ovn command: - ci-operator image: ci-operator:latest @@ -152,23 +152,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.7-azure-images,?($|\s.*) + trigger: (?m)^/test( | .* )4.8-aws-ovn-images,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build01 - context: ci/prow/4.7-gcp-images + context: ci/prow/4.8-azure-images decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: 4.7-gcp + ci-operator.openshift.io/variant: 4.8-azure pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serverless-operator-main-4.7-gcp-images - rerun_command: /test 4.7-gcp-images + name: pull-ci-openshift-knative-serverless-operator-main-4.8-azure-images + rerun_command: /test 4.8-azure-images spec: containers: - args: @@ -176,7 +176,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=4.7-gcp + - --variant=4.8-azure command: - ci-operator image: ci-operator:latest @@ -203,23 +203,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.7-gcp-images,?($|\s.*) + trigger: (?m)^/test( | .* )4.8-azure-images,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - ^main$ - ^main- cluster: build01 - context: ci/prow/4.7-images + context: ci/prow/4.8-gcp-images decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: "4.7" + ci-operator.openshift.io/variant: 4.8-gcp pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serverless-operator-main-4.7-images - rerun_command: /test 4.7-images + name: pull-ci-openshift-knative-serverless-operator-main-4.8-gcp-images + rerun_command: /test 4.8-gcp-images spec: containers: - args: @@ -227,7 +227,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=4.7 + - --variant=4.8-gcp command: - ci-operator image: ci-operator:latest @@ -254,34 +254,31 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.7-images,?($|\s.*) + trigger: (?m)^/test( | .* )4.8-gcp-images,?($|\s.*) - agent: kubernetes always_run: true branches: - ^main$ - ^main- cluster: build01 - context: ci/prow/4.7-operator-e2e-aws-ocp-47 + context: ci/prow/4.8-images decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: "4.7" + ci-operator.openshift.io/variant: "4.8" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serverless-operator-main-4.7-operator-e2e-aws-ocp-47 - rerun_command: /test 4.7-operator-e2e-aws-ocp-47 + name: pull-ci-openshift-knative-serverless-operator-main-4.8-images + 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 - - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/operator-e2e-aws-ocp-47-cluster-profile - - --target=operator-e2e-aws-ocp-47 - - --variant=4.7 + - --target=[images] + - --variant=4.8 command: - ci-operator image: ci-operator:latest @@ -291,14 +288,6 @@ 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/operator-e2e-aws-ocp-47-cluster-profile - name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials readOnly: true @@ -310,55 +299,39 @@ 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 - projected: - sources: - - secret: - name: cluster-secrets-aws - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.7-operator-e2e-aws-ocp-47,?($|\s.*) + trigger: (?m)^/test( | .* )4.8-images,?($|\s.*) - agent: kubernetes always_run: true branches: - ^main$ - ^main- cluster: build01 - context: ci/prow/4.7-upgrade-tests-aws-ocp-47 + context: ci/prow/4.8-operator-e2e-aws-ocp-48 decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: "4.7" + ci-operator.openshift.io/variant: "4.8" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serverless-operator-main-4.7-upgrade-tests-aws-ocp-47 - optional: true - rerun_command: /test 4.7-upgrade-tests-aws-ocp-47 + name: pull-ci-openshift-knative-serverless-operator-main-4.8-operator-e2e-aws-ocp-48 + rerun_command: /test 4.8-operator-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 - - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/upgrade-tests-aws-ocp-47-cluster-profile - - --target=upgrade-tests-aws-ocp-47 - - --variant=4.7 + - --target=operator-e2e-aws-ocp-48 + - --variant=4.8 command: - ci-operator image: ci-operator:latest @@ -368,17 +341,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/upgrade-tests-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 @@ -387,55 +358,46 @@ 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 - projected: - sources: - - secret: - name: cluster-secrets-aws + - 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.7-upgrade-tests-aws-ocp-47,?($|\s.*) + trigger: (?m)^/test( | .* )4.8-operator-e2e-aws-ocp-48,?($|\s.*) - agent: kubernetes always_run: true branches: - ^main$ - ^main- cluster: build01 - context: ci/prow/4.7-upstream-e2e-aws-ocp-47 + context: ci/prow/4.8-upgrade-tests-aws-ocp-48 decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: "4.7" + ci-operator.openshift.io/variant: "4.8" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serverless-operator-main-4.7-upstream-e2e-aws-ocp-47 + name: pull-ci-openshift-knative-serverless-operator-main-4.8-upgrade-tests-aws-ocp-48 optional: true - rerun_command: /test 4.7-upstream-e2e-aws-ocp-47 + rerun_command: /test 4.8-upgrade-tests-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 - - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/upstream-e2e-aws-ocp-47-cluster-profile - - --target=upstream-e2e-aws-ocp-47 - - --variant=4.7 + - --target=upgrade-tests-aws-ocp-48 + - --variant=4.8 command: - ci-operator image: ci-operator:latest @@ -445,17 +407,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/upstream-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 @@ -464,54 +424,46 @@ 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 - projected: - sources: - - secret: - name: cluster-secrets-aws + - 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.7-upstream-e2e-aws-ocp-47,?($|\s.*) + trigger: (?m)^/test( | .* )4.8-upgrade-tests-aws-ocp-48,?($|\s.*) - agent: kubernetes - always_run: false + always_run: true branches: - ^main$ - ^main- cluster: build01 - context: ci/prow/4.7-upstream-e2e-mesh-aws-ocp-47 + context: ci/prow/4.8-upstream-e2e-aws-ocp-48 decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: "4.7" + ci-operator.openshift.io/variant: "4.8" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serverless-operator-main-4.7-upstream-e2e-mesh-aws-ocp-47 - rerun_command: /test 4.7-upstream-e2e-mesh-aws-ocp-47 + name: pull-ci-openshift-knative-serverless-operator-main-4.8-upstream-e2e-aws-ocp-48 + optional: true + rerun_command: /test 4.8-upstream-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 - - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/upstream-e2e-mesh-aws-ocp-47-cluster-profile - - --target=upstream-e2e-mesh-aws-ocp-47 - - --variant=4.7 + - --target=upstream-e2e-aws-ocp-48 + - --variant=4.8 command: - ci-operator image: ci-operator:latest @@ -521,17 +473,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/upstream-e2e-mesh-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 @@ -540,51 +490,47 @@ 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 - projected: - sources: - - secret: - name: cluster-secrets-aws + - 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.7-upstream-e2e-mesh-aws-ocp-47,?($|\s.*) + trigger: (?m)^/test( | .* )4.8-upstream-e2e-aws-ocp-48,?($|\s.*) - agent: kubernetes - always_run: false + always_run: true branches: - ^main$ - ^main- - cluster: vsphere - context: ci/prow/4.7-vsphere-images + cluster: build01 + context: ci/prow/4.8-upstream-e2e-mesh-aws-ocp-48 decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: 4.7-vsphere + ci-operator.openshift.io/variant: "4.8" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serverless-operator-main-4.7-vsphere-images - rerun_command: /test 4.7-vsphere-images + name: pull-ci-openshift-knative-serverless-operator-main-4.8-upstream-e2e-mesh-aws-ocp-48 + optional: true + rerun_command: /test 4.8-upstream-e2e-mesh-aws-ocp-48 spec: containers: - args: - --gcs-upload-secret=/secrets/gcs/service-account.json - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - - --target=[images] - - --variant=4.7-vsphere + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/upstream-e2e-mesh-aws-ocp-48-cluster-profile + - --target=upstream-e2e-mesh-aws-ocp-48 + - --variant=4.8 command: - ci-operator image: ci-operator:latest @@ -594,6 +540,14 @@ 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/upstream-e2e-mesh-aws-ocp-48-cluster-profile + name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials readOnly: true @@ -605,30 +559,43 @@ 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 + projected: + sources: + - secret: + name: cluster-secrets-aws - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.7-vsphere-images,?($|\s.*) + trigger: (?m)^/test( | .* )4.8-upstream-e2e-mesh-aws-ocp-48,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- - cluster: build01 - context: ci/prow/4.8-images + cluster: vsphere + context: ci/prow/4.8-vsphere-images decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - ci-operator.openshift.io/variant: "4.8" - job-release: "4.8" + ci-operator.openshift.io/variant: 4.8-vsphere pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-knative-serverless-operator-main-4.8-images - rerun_command: /test 4.8-images + name: pull-ci-openshift-knative-serverless-operator-main-4.8-vsphere-images + rerun_command: /test 4.8-vsphere-images spec: containers: - args: @@ -636,7 +603,7 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --variant=4.8 + - --variant=4.8-vsphere command: - ci-operator image: ci-operator:latest @@ -663,7 +630,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.8-images,?($|\s.*) + trigger: (?m)^/test( | .* )4.8-vsphere-images,?($|\s.*) - agent: kubernetes always_run: true branches: