diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.8-upgrade-from-from-stable-4.7-from-stable-4.6.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.8-upgrade-from-from-stable-4.7-from-stable-4.6.yaml new file mode 100644 index 0000000000000..ea518a23422b7 --- /dev/null +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.8-upgrade-from-from-stable-4.7-from-stable-4.6.yaml @@ -0,0 +1,44 @@ +releases: + initial: + release: + channel: stable + version: "4.6" + intermediate: + release: + channel: stable + version: "4.7" + latest: + candidate: + product: ocp + stream: ci + version: "4.8" +resources: + '*': + requests: + cpu: 100m + memory: 200Mi +tests: +- as: e2e-aws-upgrade + interval: 48h + steps: + cluster_profile: aws + env: + TEST_UPGRADE_OPTIONS: "" + test: + - as: set-releases-release + commands: echo "${RELEASE_IMAGE_INTERMEDIATE},${RELEASE_IMAGE_LATEST}" > ${SHARED_DIR}/override-upgrade + dependencies: + - env: RELEASE_IMAGE_INTERMEDIATE + name: release:intermediate + from: cli + resources: + requests: + cpu: 100m + memory: 200Mi + - ref: openshift-e2e-test + workflow: openshift-upgrade-aws +zz_generated_metadata: + branch: master + org: openshift + repo: release + variant: ci-4.8-upgrade-from-from-stable-4.7-from-stable-4.6 diff --git a/ci-operator/config/openshift/release/openshift-release-master__stable-4.7-upgrade-from-stable-4.6-from-stable-4.5.yaml b/ci-operator/config/openshift/release/openshift-release-master__stable-4.7-upgrade-from-stable-4.6-from-stable-4.5.yaml new file mode 100644 index 0000000000000..bee8bad6ffc79 --- /dev/null +++ b/ci-operator/config/openshift/release/openshift-release-master__stable-4.7-upgrade-from-stable-4.6-from-stable-4.5.yaml @@ -0,0 +1,43 @@ +releases: + initial: + release: + channel: stable + version: "4.5" + intermediate: + release: + channel: stable + version: "4.6" + latest: + release: + channel: stable + version: "4.7" +resources: + '*': + requests: + cpu: 100m + memory: 200Mi +tests: +- as: e2e-aws-upgrade + interval: 48h + steps: + cluster_profile: aws + env: + TEST_UPGRADE_OPTIONS: "" + test: + - as: set-releases-release + commands: echo "${RELEASE_IMAGE_INTERMEDIATE},${RELEASE_IMAGE_LATEST}" > ${SHARED_DIR}/override-upgrade + dependencies: + - env: RELEASE_IMAGE_INTERMEDIATE + name: release:intermediate + from: cli + resources: + requests: + cpu: 100m + memory: 200Mi + - ref: openshift-e2e-test + workflow: openshift-upgrade-aws +zz_generated_metadata: + branch: master + org: openshift + repo: release + variant: stable-4.7-upgrade-from-stable-4.6-from-stable-4.5 diff --git a/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml index 7b9abeba9b346..cc3b67afc4a45 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml @@ -7249,6 +7249,81 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build02 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: openshift + repo: release + interval: 48h + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: ci-4.8-upgrade-from-from-stable-4.7-from-stable-4.6 + job-release: "4.8" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-release-master-ci-4.8-upgrade-from-from-stable-4.7-from-stable-4.6-e2e-aws-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/e2e-aws-upgrade-cluster-profile + - --target=e2e-aws-upgrade + - --variant=ci-4.8-upgrade-from-from-stable-4.7-from-stable-4.6 + 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/e2e-aws-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 + projected: + sources: + - secret: + name: cluster-secrets-aws + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: build02 decorate: true @@ -21602,3 +21677,77 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build02 + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: master + org: openshift + repo: release + interval: 48h + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + ci-operator.openshift.io/variant: stable-4.7-upgrade-from-stable-4.6-from-stable-4.5 + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-release-master-stable-4.7-upgrade-from-stable-4.6-from-stable-4.5-e2e-aws-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/e2e-aws-upgrade-cluster-profile + - --target=e2e-aws-upgrade + - --variant=stable-4.7-upgrade-from-stable-4.6-from-stable-4.5 + 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/e2e-aws-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 + projected: + sources: + - secret: + name: cluster-secrets-aws + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator