diff --git a/ci-operator/config/openshift/api/openshift-api-master.yaml b/ci-operator/config/openshift/api/openshift-api-master.yaml index 03ae094730236..ed70775612362 100644 --- a/ci-operator/config/openshift/api/openshift-api-master.yaml +++ b/ci-operator/config/openshift/api/openshift-api-master.yaml @@ -147,6 +147,14 @@ tests: steps: cluster_profile: aws workflow: openshift-upgrade-aws +- as: e2e-upgrade-out-of-change + run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$ + steps: + cluster_profile: aws + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest + OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial + workflow: openshift-upgrade-aws - as: e2e-aws-ovn-hypershift run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$ steps: diff --git a/ci-operator/jobs/openshift/api/openshift-api-master-presubmits.yaml b/ci-operator/jobs/openshift/api/openshift-api-master-presubmits.yaml index d8e5995f75946..194c689aacfdd 100644 --- a/ci-operator/jobs/openshift/api/openshift-api-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/api/openshift-api-master-presubmits.yaml @@ -639,6 +639,79 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build03 + context: ci/prow/e2e-upgrade-out-of-change + decorate: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-api-master-e2e-upgrade-out-of-change + rerun_command: /test e2e-upgrade-out-of-change + run_if_changed: ^Dockerfile\.ocp$|^Makefile$|^(manifests/.*|payload-command/.*|payload-manifests/.*)$ + 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 + - --target=e2e-upgrade-out-of-change + 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: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + 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: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-upgrade-out-of-change,?($|\s.*) - agent: kubernetes always_run: true branches: