diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.11.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.11.yaml index d2d7bbd32fcc6..adb63786ed51e 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.11.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.11.yaml @@ -129,6 +129,16 @@ resources: cpu: 100m memory: 200Mi tests: +- as: ocp-e2e-aws-ovn-heterogeneous-upgrade + interval: 72h + steps: + cluster_profile: aws-2 + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-initial + OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:multi-latest + env: + BASE_DOMAIN: aws-2.ci.openshift.org + workflow: openshift-upgrade-aws-heterogeneous - as: ocp-e2e-aws-heterogeneous cron: 33 7 * * 3 steps: diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.12-upgrade-from-nightly-4.11.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.12-upgrade-from-nightly-4.11.yaml index 1f8282ba0e84c..589fcfdc6d77c 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.12-upgrade-from-nightly-4.11.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.12-upgrade-from-nightly-4.11.yaml @@ -74,6 +74,18 @@ releases: product: ocp stream: nightly version: "4.12" + multi-initial: + candidate: + architecture: multi + product: ocp + stream: nightly + version: "4.11" + multi-latest: + candidate: + architecture: multi + product: ocp + stream: nightly + version: "4.12" ppc64le-initial: candidate: architecture: ppc64le @@ -104,6 +116,16 @@ resources: cpu: 100m memory: 200Mi tests: +- as: ocp-e2e-aws-heterogeneous-upgrade + interval: 72h + steps: + cluster_profile: aws-2 + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-initial + OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:multi-latest + env: + BASE_DOMAIN: aws-2.ci.openshift.org + workflow: openshift-upgrade-aws-heterogeneous - as: ocp-e2e-aws-sdn-arm64 interval: 72h steps: diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.12-upgrade-from-stable-4.11.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.12-upgrade-from-stable-4.11.yaml index 3876ec371d251..78c9e956a32ff 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.12-upgrade-from-stable-4.11.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.12-upgrade-from-stable-4.11.yaml @@ -64,12 +64,35 @@ releases: product: ocp stream: nightly version: "4.12" + multi-initial: + prerelease: + architecture: multi + product: ocp + version_bounds: + lower: 4.11.0-0 + upper: 4.12.0-0 + multi-latest: + candidate: + architecture: multi + product: ocp + stream: nightly + version: "4.12" resources: '*': requests: cpu: 100m memory: 200Mi tests: +- as: ocp-e2e-aws-heterogeneous-upgrade + interval: 72h + steps: + cluster_profile: aws-2 + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-initial + OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:multi-latest + env: + BASE_DOMAIN: aws-2.ci.openshift.org + workflow: openshift-upgrade-aws-heterogeneous - as: ocp-e2e-aws-sdn-arm64 interval: 72h steps: diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.12.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.12.yaml index 63cbdb2d098f0..9c13c3c106ecf 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.12.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.12.yaml @@ -129,6 +129,16 @@ resources: cpu: 100m memory: 200Mi tests: +- as: ocp-e2e-aws-ovn-heterogeneous-upgrade + interval: 72h + steps: + cluster_profile: aws-2 + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-initial + OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:multi-latest + env: + BASE_DOMAIN: aws-2.ci.openshift.org + workflow: openshift-upgrade-aws-heterogeneous - as: ocp-e2e-aws-ovn-heterogeneous cron: 08 11 * * 5 steps: diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.13-upgrade-from-nightly-4.12.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.13-upgrade-from-nightly-4.12.yaml index c5885852ec532..113539980c22b 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.13-upgrade-from-nightly-4.12.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.13-upgrade-from-nightly-4.12.yaml @@ -74,6 +74,18 @@ releases: product: ocp stream: nightly version: "4.13" + multi-initial: + candidate: + architecture: multi + product: ocp + stream: nightly + version: "4.12" + multi-latest: + candidate: + architecture: multi + product: ocp + stream: nightly + version: "4.13" ppc64le-initial: candidate: architecture: ppc64le @@ -104,6 +116,16 @@ resources: cpu: 100m memory: 200Mi tests: +- as: ocp-e2e-aws-heterogeneous-upgrade + interval: 72h + steps: + cluster_profile: aws-2 + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-initial + OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:multi-latest + env: + BASE_DOMAIN: aws-2.ci.openshift.org + workflow: openshift-upgrade-aws-heterogeneous - as: ocp-e2e-aws-sdn-arm64 interval: 72h steps: diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.13-upgrade-from-stable-4.12.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.13-upgrade-from-stable-4.12.yaml index 490e30d27a931..ba460c0cbb9a9 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.13-upgrade-from-stable-4.12.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.13-upgrade-from-stable-4.12.yaml @@ -64,12 +64,35 @@ releases: product: ocp stream: nightly version: "4.13" + multi-initial: + prerelease: + architecture: multi + product: ocp + version_bounds: + lower: 4.12.0-0 + upper: 4.13.0-0 + multi-latest: + candidate: + architecture: multi + product: ocp + stream: nightly + version: "4.13" resources: '*': requests: cpu: 100m memory: 200Mi tests: +- as: ocp-e2e-aws-heterogeneous-upgrade + interval: 72h + steps: + cluster_profile: aws-2 + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-initial + OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:multi-latest + env: + BASE_DOMAIN: aws-2.ci.openshift.org + workflow: openshift-upgrade-aws-heterogeneous - as: ocp-e2e-aws-sdn-arm64 interval: 72h steps: diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.13.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.13.yaml index e8ad5315db923..bc06d852d4cfa 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.13.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.13.yaml @@ -129,6 +129,16 @@ resources: cpu: 100m memory: 200Mi tests: +- as: ocp-e2e-aws-ovn-heterogeneous-upgrade + interval: 72h + steps: + cluster_profile: aws-2 + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-initial + OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:multi-latest + env: + BASE_DOMAIN: aws-2.ci.openshift.org + workflow: openshift-upgrade-aws-heterogeneous - as: ocp-e2e-aws-ovn-heterogeneous cron: 08 11 * * 5 steps: diff --git a/ci-operator/jobs/openshift/multiarch/openshift-multiarch-master-periodics.yaml b/ci-operator/jobs/openshift/multiarch/openshift-multiarch-master-periodics.yaml index 074981f97c1c3..a7d1a05f895f9 100644 --- a/ci-operator/jobs/openshift/multiarch/openshift-multiarch-master-periodics.yaml +++ b/ci-operator/jobs/openshift/multiarch/openshift-multiarch-master-periodics.yaml @@ -2036,6 +2036,81 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build05 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: openshift + repo: multiarch + interval: 72h + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 + ci-operator.openshift.io/variant: nightly-4.11 + ci.openshift.io/generator: prowgen + job-release: "4.11" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-multiarch-master-nightly-4.11-ocp-e2e-aws-ovn-heterogeneous-upgrade + 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/ocp-e2e-aws-ovn-heterogeneous-upgrade-cluster-profile + - --target=ocp-e2e-aws-ovn-heterogeneous-upgrade + - --variant=nightly-4.11 + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + 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/ocp-e2e-aws-ovn-heterogeneous-upgrade-cluster-profile + name: cluster-profile + - 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: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + secret: + secretName: cluster-secrets-aws-2 + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build03 cron: 42 0 */1 * 1-5 @@ -4149,6 +4224,81 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build05 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: openshift + repo: multiarch + interval: 72h + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 + ci-operator.openshift.io/variant: nightly-4.12 + ci.openshift.io/generator: prowgen + job-release: "4.12" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-multiarch-master-nightly-4.12-ocp-e2e-aws-ovn-heterogeneous-upgrade + 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/ocp-e2e-aws-ovn-heterogeneous-upgrade-cluster-profile + - --target=ocp-e2e-aws-ovn-heterogeneous-upgrade + - --variant=nightly-4.12 + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + 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/ocp-e2e-aws-ovn-heterogeneous-upgrade-cluster-profile + name: cluster-profile + - 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: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + secret: + secretName: cluster-secrets-aws-2 + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build03 decorate: true @@ -5887,6 +6037,81 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build05 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: openshift + repo: multiarch + interval: 72h + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 + ci-operator.openshift.io/variant: nightly-4.12-upgrade-from-nightly-4.11 + ci.openshift.io/generator: prowgen + job-release: "4.12" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-multiarch-master-nightly-4.12-upgrade-from-nightly-4.11-ocp-e2e-aws-heterogeneous-upgrade + 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/ocp-e2e-aws-heterogeneous-upgrade-cluster-profile + - --target=ocp-e2e-aws-heterogeneous-upgrade + - --variant=nightly-4.12-upgrade-from-nightly-4.11 + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + 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/ocp-e2e-aws-heterogeneous-upgrade-cluster-profile + name: cluster-profile + - 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: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + secret: + secretName: cluster-secrets-aws-2 + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build03 decorate: true @@ -6114,6 +6339,81 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build05 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: openshift + repo: multiarch + interval: 72h + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 + ci-operator.openshift.io/variant: nightly-4.12-upgrade-from-stable-4.11 + ci.openshift.io/generator: prowgen + job-release: "4.12" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-multiarch-master-nightly-4.12-upgrade-from-stable-4.11-ocp-e2e-aws-heterogeneous-upgrade + 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/ocp-e2e-aws-heterogeneous-upgrade-cluster-profile + - --target=ocp-e2e-aws-heterogeneous-upgrade + - --variant=nightly-4.12-upgrade-from-stable-4.11 + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + 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/ocp-e2e-aws-heterogeneous-upgrade-cluster-profile + name: cluster-profile + - 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: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + secret: + secretName: cluster-secrets-aws-2 + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build03 decorate: true @@ -6564,6 +6864,81 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build05 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: openshift + repo: multiarch + interval: 72h + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 + ci-operator.openshift.io/variant: nightly-4.13 + ci.openshift.io/generator: prowgen + job-release: "4.13" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-multiarch-master-nightly-4.13-ocp-e2e-aws-ovn-heterogeneous-upgrade + 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/ocp-e2e-aws-ovn-heterogeneous-upgrade-cluster-profile + - --target=ocp-e2e-aws-ovn-heterogeneous-upgrade + - --variant=nightly-4.13 + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + 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/ocp-e2e-aws-ovn-heterogeneous-upgrade-cluster-profile + name: cluster-profile + - 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: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + secret: + secretName: cluster-secrets-aws-2 + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build03 decorate: true @@ -8302,6 +8677,81 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build05 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: openshift + repo: multiarch + interval: 72h + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 + ci-operator.openshift.io/variant: nightly-4.13-upgrade-from-nightly-4.12 + ci.openshift.io/generator: prowgen + job-release: "4.13" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-multiarch-master-nightly-4.13-upgrade-from-nightly-4.12-ocp-e2e-aws-heterogeneous-upgrade + 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/ocp-e2e-aws-heterogeneous-upgrade-cluster-profile + - --target=ocp-e2e-aws-heterogeneous-upgrade + - --variant=nightly-4.13-upgrade-from-nightly-4.12 + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + 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/ocp-e2e-aws-heterogeneous-upgrade-cluster-profile + name: cluster-profile + - 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: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + secret: + secretName: cluster-secrets-aws-2 + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build03 decorate: true @@ -8529,6 +8979,81 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build05 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: openshift + repo: multiarch + interval: 72h + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 + ci-operator.openshift.io/variant: nightly-4.13-upgrade-from-stable-4.12 + ci.openshift.io/generator: prowgen + job-release: "4.13" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-multiarch-master-nightly-4.13-upgrade-from-stable-4.12-ocp-e2e-aws-heterogeneous-upgrade + 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/ocp-e2e-aws-heterogeneous-upgrade-cluster-profile + - --target=ocp-e2e-aws-heterogeneous-upgrade + - --variant=nightly-4.13-upgrade-from-stable-4.12 + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + 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/ocp-e2e-aws-heterogeneous-upgrade-cluster-profile + name: cluster-profile + - 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: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + secret: + secretName: cluster-secrets-aws-2 + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build03 decorate: true diff --git a/ci-operator/step-registry/ipi/install/heterogeneous/ipi-install-heterogeneous-commands.sh b/ci-operator/step-registry/ipi/install/heterogeneous/ipi-install-heterogeneous-commands.sh index 0ce5a5283181c..7046223965d82 100644 --- a/ci-operator/step-registry/ipi/install/heterogeneous/ipi-install-heterogeneous-commands.sh +++ b/ci-operator/step-registry/ipi/install/heterogeneous/ipi-install-heterogeneous-commands.sh @@ -4,8 +4,6 @@ set -o nounset set -o errexit set -o pipefail -export KUBECONFIG=${SHARED_DIR}/kubeconfig - trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM # Make sure yq is installed @@ -53,11 +51,5 @@ exec oc create -f ${dir}/99_openshift-cluster-api_worker-machineset-additional.y wait "$!" ret="$?" -if test "${ret}" -eq 0 ; then - touch "${SHARED_DIR}/success" - # Save console URL in `console.url` file so that ci-chat-bot could report success - echo "https://$(env KUBECONFIG=${dir}/auth/kubeconfig oc -n openshift-console get routes console -o=jsonpath='{.spec.host}')" > "${SHARED_DIR}/console.url" -fi - echo "Exiting with ret=${ret}" exit "${ret}" diff --git a/ci-operator/step-registry/openshift/e2e/aws/heterogeneous/openshift-e2e-aws-heterogeneous-workflow.yaml b/ci-operator/step-registry/openshift/e2e/aws/heterogeneous/openshift-e2e-aws-heterogeneous-workflow.yaml index 11c495d1d726e..c0fbdd4652b07 100644 --- a/ci-operator/step-registry/openshift/e2e/aws/heterogeneous/openshift-e2e-aws-heterogeneous-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/aws/heterogeneous/openshift-e2e-aws-heterogeneous-workflow.yaml @@ -28,4 +28,4 @@ workflow: pod should start with all sysctl on whitelist\| pod sysctls should not affect node\| when FIPS is disabled the HAProxy router should serve routes when configured with a 1024-bit RSA key documentation: |- - The Openshift E2E HETEROGENEOUS AWS workflow executes the common end-to-end test suite on AWS with a default cluster configuration. + The Openshift E2E HETEROGENEOUS AWS workflow executes the common end-to-end test suite on AWS with a heterogeneous cluster. diff --git a/ci-operator/step-registry/openshift/upgrade/OWNERS b/ci-operator/step-registry/openshift/upgrade/OWNERS index a35725a4a287f..9e757cfd3d64f 100644 --- a/ci-operator/step-registry/openshift/upgrade/OWNERS +++ b/ci-operator/step-registry/openshift/upgrade/OWNERS @@ -2,3 +2,4 @@ approvers: - wking - jluhrsen - deads2k +- petr-muller diff --git a/ci-operator/step-registry/openshift/upgrade/aws/heterogeneous/OWNERS b/ci-operator/step-registry/openshift/upgrade/aws/heterogeneous/OWNERS new file mode 120000 index 0000000000000..ec405d65a79df --- /dev/null +++ b/ci-operator/step-registry/openshift/upgrade/aws/heterogeneous/OWNERS @@ -0,0 +1 @@ +../OWNERS \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/upgrade/aws/heterogeneous/openshift-upgrade-aws-heterogeneous-workflow.metadata.json b/ci-operator/step-registry/openshift/upgrade/aws/heterogeneous/openshift-upgrade-aws-heterogeneous-workflow.metadata.json new file mode 100644 index 0000000000000..4357f8413f627 --- /dev/null +++ b/ci-operator/step-registry/openshift/upgrade/aws/heterogeneous/openshift-upgrade-aws-heterogeneous-workflow.metadata.json @@ -0,0 +1,10 @@ +{ + "path": "openshift/upgrade/aws/heterogeneous/openshift-upgrade-aws-heterogeneous-workflow.yaml", + "owners": { + "approvers": [ + "wking", + "jluhrsen", + "deads2k" + ] + } +} \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/upgrade/aws/heterogeneous/openshift-upgrade-aws-heterogeneous-workflow.yaml b/ci-operator/step-registry/openshift/upgrade/aws/heterogeneous/openshift-upgrade-aws-heterogeneous-workflow.yaml new file mode 100644 index 0000000000000..d453324bdc96f --- /dev/null +++ b/ci-operator/step-registry/openshift/upgrade/aws/heterogeneous/openshift-upgrade-aws-heterogeneous-workflow.yaml @@ -0,0 +1,24 @@ +workflow: + as: openshift-upgrade-aws-heterogeneous + steps: + allow_best_effort_post_steps: true + pre: + - ref: ipi-install-hosted-loki + - chain: ipi-aws-pre-stableinitial + - ref: ipi-install-heterogeneous + test: + - ref: openshift-e2e-test + post: + - ref: openshift-e2e-test-capabilities-check + - chain: gather-core-dump + - chain: ipi-aws-post + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: "release:initial" + OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: "release:latest" + env: + TEST_TYPE: upgrade + TEST_SUITE: "" + TEST_UPGRADE_OPTIONS: "" + DELETE_MC: "false" + documentation: |- + The Openshift E2E AWS workflow executes the upgrade end-to-end test suite on AWS with a heterogeneous cluster, exercising an upgrade during the process.