diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.11__okd.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.11__okd.yaml index be6e75de6de14..a26d4b6e20463 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.11__okd.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.11__okd.yaml @@ -204,15 +204,6 @@ tests: steps: cluster_profile: vsphere workflow: openshift-e2e-vsphere -- as: e2e-aws-ovn-stable-stream - cron: 30 0 * * * - steps: - cluster_profile: aws - pre: - - chain: ipi-conf-aws - - ref: ipi-conf-aws-fcos-ami - - chain: ipi-install - workflow: openshift-e2e-aws zz_generated_metadata: branch: release-4.11 org: openshift diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.12__okd.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.12__okd.yaml index 60fdc657b06bc..aad12e83d043e 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.12__okd.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.12__okd.yaml @@ -205,10 +205,12 @@ tests: steps: cluster_profile: vsphere workflow: openshift-e2e-vsphere -- as: e2e-aws-ovn-testing-stream +- as: e2e-aws-ovn-stable-stream cron: 30 0 * * * steps: cluster_profile: aws + env: + STREAM: stable pre: - chain: ipi-conf-aws - ref: ipi-conf-aws-fcos-ami diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.13__okd.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.13__okd.yaml index 6cd9094bad595..d2707c1898e2e 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.13__okd.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.13__okd.yaml @@ -213,6 +213,15 @@ tests: steps: cluster_profile: vsphere workflow: openshift-e2e-vsphere +- as: e2e-aws-ovn-testing-stream + cron: 30 0 * * * + steps: + cluster_profile: aws + pre: + - chain: ipi-conf-aws + - ref: ipi-conf-aws-fcos-ami + - chain: ipi-install + workflow: openshift-e2e-aws zz_generated_metadata: branch: release-4.13 org: openshift diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.12-periodics.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.12-periodics.yaml index 125a435fca7c3..3ded59bb70fbc 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.12-periodics.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.12-periodics.yaml @@ -13,7 +13,7 @@ periodics: ci-operator.openshift.io/variant: okd ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-installer-release-4.12-okd-e2e-aws-ovn-testing-stream + name: periodic-ci-openshift-installer-release-4.12-okd-e2e-aws-ovn-stable-stream spec: containers: - args: @@ -22,8 +22,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-ovn-testing-stream-cluster-profile - - --target=e2e-aws-ovn-testing-stream + - --secret-dir=/usr/local/e2e-aws-ovn-stable-stream-cluster-profile + - --target=e2e-aws-ovn-stable-stream - --variant=okd command: - ci-operator @@ -40,7 +40,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-ovn-testing-stream-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-stable-stream-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.11-periodics.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.13-periodics.yaml similarity index 86% rename from ci-operator/jobs/openshift/installer/openshift-installer-release-4.11-periodics.yaml rename to ci-operator/jobs/openshift/installer/openshift-installer-release-4.13-periodics.yaml index 1a289dac632e8..b38c66eb77e42 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.11-periodics.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.13-periodics.yaml @@ -4,7 +4,7 @@ periodics: cron: 30 0 * * * decorate: true extra_refs: - - base_ref: release-4.11 + - base_ref: release-4.13 org: openshift repo: installer labels: @@ -13,7 +13,7 @@ periodics: ci-operator.openshift.io/variant: okd ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-installer-release-4.11-okd-e2e-aws-ovn-stable-stream + name: periodic-ci-openshift-installer-release-4.13-okd-e2e-aws-ovn-testing-stream spec: containers: - args: @@ -22,8 +22,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-ovn-stable-stream-cluster-profile - - --target=e2e-aws-ovn-stable-stream + - --secret-dir=/usr/local/e2e-aws-ovn-testing-stream-cluster-profile + - --target=e2e-aws-ovn-testing-stream - --variant=okd command: - ci-operator @@ -40,7 +40,7 @@ periodics: - mountPath: /secrets/ci-pull-credentials name: ci-pull-credentials readOnly: true - - mountPath: /usr/local/e2e-aws-ovn-stable-stream-cluster-profile + - mountPath: /usr/local/e2e-aws-ovn-testing-stream-cluster-profile name: cluster-profile - mountPath: /secrets/gcs name: gcs-credentials