diff --git a/ci-operator/config/openshift/release/openshift-release-master__stable-4.8-upgrade-from-stable-4.2.yaml b/ci-operator/config/openshift/release/openshift-release-master__stable-4.8-upgrade-from-stable-4.2.yaml new file mode 100644 index 0000000000000..6339f45bef7ff --- /dev/null +++ b/ci-operator/config/openshift/release/openshift-release-master__stable-4.8-upgrade-from-stable-4.2.yaml @@ -0,0 +1,71 @@ +releases: + four-five: + release: + channel: stable + version: "4.5" + four-four: + release: + channel: stable + version: "4.4" + four-seven: + release: + channel: stable + version: "4.7" + four-six: + release: + channel: stable + version: "4.6" + four-three: + release: + channel: stable + version: "4.3" + initial: + release: + channel: stable + version: "4.2" + latest: + release: + channel: stable + version: "4.8" +resources: + '*': + requests: + cpu: 100m + memory: 200Mi +tests: +- as: e2e-aws-upgrade + interval: 72h + steps: + cluster_profile: aws-2 + env: + BASE_DOMAIN: aws-2.ci.openshift.org + TEST_UPGRADE_OPTIONS: "" + TEST_UPGRADE_SUITE: none + test: + - as: set-releases-release + commands: | + echo "${RELEASE_IMAGE_4_3},${RELEASE_IMAGE_4_4},${RELEASE_IMAGE_4_5},${RELEASE_IMAGE_4_6},${RELEASE_IMAGE_4_7},${RELEASE_IMAGE_LATEST}" > ${SHARED_DIR}/override-upgrade + dependencies: + - env: RELEASE_IMAGE_4_3 + name: release:four-three + - env: RELEASE_IMAGE_4_4 + name: release:four-four + - env: RELEASE_IMAGE_4_5 + name: release:four-five + - env: RELEASE_IMAGE_4_6 + name: release:four-six + - env: RELEASE_IMAGE_4_7 + name: release:four-seven + from: cli + resources: + requests: + cpu: 100m + memory: 200Mi + - ref: openshift-e2e-test + workflow: openshift-upgrade-aws + timeout: 8h0m0s +zz_generated_metadata: + branch: master + org: openshift + repo: release + variant: stable-4.8-upgrade-from-stable-4.2 diff --git a/ci-operator/config/openshift/release/openshift-release-master__stable-4.8-upgrade-from-stable-4.3.yaml b/ci-operator/config/openshift/release/openshift-release-master__stable-4.8-upgrade-from-stable-4.3.yaml new file mode 100644 index 0000000000000..a399459b6e970 --- /dev/null +++ b/ci-operator/config/openshift/release/openshift-release-master__stable-4.8-upgrade-from-stable-4.3.yaml @@ -0,0 +1,65 @@ +releases: + four-five: + release: + channel: stable + version: "4.5" + four-four: + release: + channel: stable + version: "4.4" + four-seven: + release: + channel: stable + version: "4.7" + four-six: + release: + channel: stable + version: "4.6" + initial: + release: + channel: stable + version: "4.3" + latest: + release: + channel: stable + version: "4.8" +resources: + '*': + requests: + cpu: 100m + memory: 200Mi +tests: +- as: e2e-aws-upgrade + interval: 72h + steps: + cluster_profile: aws-2 + env: + BASE_DOMAIN: aws-2.ci.openshift.org + TEST_UPGRADE_OPTIONS: "" + TEST_UPGRADE_SUITE: none + test: + - as: set-releases-release + commands: | + env | grep "RELEASE"; echo "${RELEASE_IMAGE_4_4},${RELEASE_IMAGE_4_5},${RELEASE_IMAGE_4_6},${RELEASE_IMAGE_4_7},${RELEASE_IMAGE_LATEST}" > ${SHARED_DIR}/override-upgrade + dependencies: + - env: RELEASE_IMAGE_4_4 + name: release:four-four + - env: RELEASE_IMAGE_4_5 + name: release:four-five + - env: RELEASE_IMAGE_4_6 + name: release:four-six + - env: RELEASE_IMAGE_4_7 + name: release:four-seven + from: cli + resources: + requests: + cpu: 100m + memory: 200Mi + - ref: openshift-e2e-test-8h + workflow: openshift-upgrade-aws + timeout: 8h0m0s +zz_generated_metadata: + branch: master + org: openshift + repo: release + variant: stable-4.8-upgrade-from-stable-4.3 diff --git a/ci-operator/config/openshift/release/openshift-release-master__stable-4.8-upgrade-from-stable-4.4.yaml b/ci-operator/config/openshift/release/openshift-release-master__stable-4.8-upgrade-from-stable-4.4.yaml new file mode 100644 index 0000000000000..83b392eb79033 --- /dev/null +++ b/ci-operator/config/openshift/release/openshift-release-master__stable-4.8-upgrade-from-stable-4.4.yaml @@ -0,0 +1,59 @@ +releases: + four-five: + release: + channel: stable + version: "4.5" + four-seven: + release: + channel: stable + version: "4.7" + four-six: + release: + channel: stable + version: "4.6" + initial: + release: + channel: stable + version: "4.4" + latest: + release: + channel: stable + version: "4.8" +resources: + '*': + requests: + cpu: 100m + memory: 200Mi +tests: +- as: e2e-aws-upgrade + interval: 72h + steps: + cluster_profile: aws-2 + env: + BASE_DOMAIN: aws-2.ci.openshift.org + TEST_UPGRADE_OPTIONS: "" + TEST_UPGRADE_SUITE: none + test: + - as: set-releases-release + commands: | + env | grep "RELEASE"; echo "${RELEASE_IMAGE_4_5},${RELEASE_IMAGE_4_6},${RELEASE_IMAGE_4_7},${RELEASE_IMAGE_LATEST}" > ${SHARED_DIR}/override-upgrade + dependencies: + - env: RELEASE_IMAGE_4_5 + name: release:four-five + - env: RELEASE_IMAGE_4_6 + name: release:four-six + - env: RELEASE_IMAGE_4_7 + name: release:four-seven + from: cli + resources: + requests: + cpu: 100m + memory: 200Mi + - ref: openshift-e2e-test-8h + workflow: openshift-upgrade-aws + timeout: 8h0m0s +zz_generated_metadata: + branch: master + org: openshift + repo: release + variant: stable-4.8-upgrade-from-stable-4.4 diff --git a/ci-operator/config/openshift/release/openshift-release-master__stable-4.8-upgrade-from-stable-4.5.yaml b/ci-operator/config/openshift/release/openshift-release-master__stable-4.8-upgrade-from-stable-4.5.yaml new file mode 100644 index 0000000000000..544722cc3e1d8 --- /dev/null +++ b/ci-operator/config/openshift/release/openshift-release-master__stable-4.8-upgrade-from-stable-4.5.yaml @@ -0,0 +1,53 @@ +releases: + four-seven: + release: + channel: stable + version: "4.7" + four-six: + release: + channel: stable + version: "4.6" + initial: + release: + channel: stable + version: "4.5" + latest: + release: + channel: stable + version: "4.8" +resources: + '*': + requests: + cpu: 100m + memory: 200Mi +tests: +- as: e2e-aws-upgrade + interval: 72h + steps: + cluster_profile: aws-2 + env: + BASE_DOMAIN: aws-2.ci.openshift.org + TEST_UPGRADE_OPTIONS: "" + TEST_UPGRADE_SUITE: none + test: + - as: set-releases-release + commands: | + env | grep "RELEASE"; echo "${RELEASE_IMAGE_4_6},${RELEASE_IMAGE_4_7},${RELEASE_IMAGE_LATEST}" > ${SHARED_DIR}/override-upgrade + dependencies: + - env: RELEASE_IMAGE_4_6 + name: release:four-six + - env: RELEASE_IMAGE_4_7 + name: release:four-seven + from: cli + resources: + requests: + cpu: 100m + memory: 200Mi + - ref: openshift-e2e-test-8h + workflow: openshift-upgrade-aws + timeout: 8h0m0s +zz_generated_metadata: + branch: master + org: openshift + repo: release + variant: stable-4.8-upgrade-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 fda8a85cef525..f9e3bfae95f16 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml @@ -39125,6 +39125,310 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator +- agent: kubernetes + cluster: build04 + decorate: true + decoration_config: + skip_cloning: true + timeout: 8h0m0s + extra_refs: + - base_ref: master + org: openshift + repo: release + interval: 72h + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 + ci-operator.openshift.io/variant: stable-4.8-upgrade-from-stable-4.2 + ci.openshift.io/generator: prowgen + ci.openshift.io/no-builds: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-release-master-stable-4.8-upgrade-from-stable-4.2-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.8-upgrade-from-stable-4.2 + 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 + secret: + secretName: cluster-secrets-aws-2 + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator +- agent: kubernetes + cluster: build04 + decorate: true + decoration_config: + skip_cloning: true + timeout: 8h0m0s + extra_refs: + - base_ref: master + org: openshift + repo: release + interval: 72h + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 + ci-operator.openshift.io/variant: stable-4.8-upgrade-from-stable-4.3 + ci.openshift.io/generator: prowgen + ci.openshift.io/no-builds: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-release-master-stable-4.8-upgrade-from-stable-4.3-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.8-upgrade-from-stable-4.3 + 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 + secret: + secretName: cluster-secrets-aws-2 + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator +- agent: kubernetes + cluster: build04 + decorate: true + decoration_config: + skip_cloning: true + timeout: 8h0m0s + extra_refs: + - base_ref: master + org: openshift + repo: release + interval: 72h + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 + ci-operator.openshift.io/variant: stable-4.8-upgrade-from-stable-4.4 + ci.openshift.io/generator: prowgen + ci.openshift.io/no-builds: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-release-master-stable-4.8-upgrade-from-stable-4.4-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.8-upgrade-from-stable-4.4 + 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 + secret: + secretName: cluster-secrets-aws-2 + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator +- agent: kubernetes + cluster: build04 + decorate: true + decoration_config: + skip_cloning: true + timeout: 8h0m0s + extra_refs: + - base_ref: master + org: openshift + repo: release + interval: 72h + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 + ci-operator.openshift.io/variant: stable-4.8-upgrade-from-stable-4.5 + ci.openshift.io/generator: prowgen + ci.openshift.io/no-builds: "true" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-release-master-stable-4.8-upgrade-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.8-upgrade-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 + secret: + secretName: cluster-secrets-aws-2 + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator - agent: kubernetes cluster: app.ci decorate: true diff --git a/ci-operator/step-registry/openshift/e2e/test/8h/OWNERS b/ci-operator/step-registry/openshift/e2e/test/8h/OWNERS new file mode 120000 index 0000000000000..ec405d65a79df --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/test/8h/OWNERS @@ -0,0 +1 @@ +../OWNERS \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/e2e/test/8h/openshift-e2e-test-8h-commands.sh b/ci-operator/step-registry/openshift/e2e/test/8h/openshift-e2e-test-8h-commands.sh new file mode 120000 index 0000000000000..2fcf06f067fb1 --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/test/8h/openshift-e2e-test-8h-commands.sh @@ -0,0 +1 @@ +../openshift-e2e-test-commands.sh \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/e2e/test/8h/openshift-e2e-test-8h-ref.metadata.json b/ci-operator/step-registry/openshift/e2e/test/8h/openshift-e2e-test-8h-ref.metadata.json new file mode 100644 index 0000000000000..a7b6823b6c2d2 --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/test/8h/openshift-e2e-test-8h-ref.metadata.json @@ -0,0 +1,13 @@ +{ + "path": "openshift/e2e/test/8h/openshift-e2e-test-8h-ref.yaml", + "owners": { + "approvers": [ + "smarterclayton", + "wking", + "vrutkovs", + "abhinavdahiya", + "deads2k", + "staebler" + ] + } +} \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/e2e/test/8h/openshift-e2e-test-8h-ref.yaml b/ci-operator/step-registry/openshift/e2e/test/8h/openshift-e2e-test-8h-ref.yaml new file mode 100644 index 0000000000000..4801f1ee87b26 --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/test/8h/openshift-e2e-test-8h-ref.yaml @@ -0,0 +1,75 @@ +ref: + as: openshift-e2e-test-8h + from: tests + grace_period: 10m + commands: openshift-e2e-test-8h-commands.sh + timeout: 8h + env: + - name: TEST_ARGS + default: "" + documentation: |- + Additional arguments to be passed to 'openshift-test' + - name: TEST_TYPE + default: "suite" + documentation: | + The type of test to perform. + + * 'suite' - Run the test suite defined by TEST_SUITE. By default this executes the + OpenShift parallel conformance suite. All product components must run the + default suite on pull requests prior to merge. + * 'suite-conformance' - Runs the test suite defined by TEST_SUITE, then runs the product conformance + suite to verify the cluster is still functional. This is typically used for testing + disruption from one suite, then confirming that the disruption did not degrade the + product. + * 'upgrade' - Perform an upgrade to the image defined by OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE. + The TEST_UPGRADE_OPTIONS flag may be optionally set. All product components + must run the default upgrade test (verify an upgrade completes) on pull requests + prior to merge. + * 'upgrade-conformance' - Performs the 'upgrade' test and then executes the full conformance + suite after upgrade completes. Does not honor TEST_SUITE but will respect + TEST_UPGRADE_OPTIONS. All product releases must pass the conformance suite after + an upgrade completes or have explicit logic in their test to tolerate behavior after + upgrade. + * 'upgrade-paused' - Perform an upgrade to the images defined by OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE with paused worker pool. + - name: TEST_SUITE + default: openshift/conformance/parallel + documentation: The test suite to run. Use 'openshift-test run --help' to list available suites. + - name: TEST_UPGRADE_SUITE + default: all + documentation: The test suite to run in upgrade tests. Use 'openshift-test run --help' to list available suites. + - name: TEST_SKIPS + default: "" + documentation: | + Regular expression (POSIX basic regular expression) of tests to skip. + It is suggested to test the regex to make sure that it matches with the available tests. + Tests can be listed by using 'openshift-tests run --dry-run (...)'. Sometimes, the tests + that are printed in Prow won't exactly match the list returned by openshift-tests. + - name: TEST_UPGRADE_OPTIONS + default: "" + documentation: Options controlling how an upgrade is performed. See `openshift-test run-upgrade --help` for more details. + - name: TEST_REQUIRES_SSH + default: "" + documentation: + If the test suite requires SSH access, setting this variable will install a bastion and configure + the Kube e2e test infrastructure to use the bastion. Otherwise, tests that require SSH will fail because + OpenShift does not expose SSH to nodes by default. + - name: TEST_INSTALL_CSI_DRIVERS + default: "" + documentation: The CSI driver(s) to use. Used by the `openshift-tests` program, see its documentation for details. + - name: TEST_CSI_DRIVER_MANIFEST + default: "" + documentation: |- + Name of the CSI driver manifest file to use. Used by the `openshift-tests` + program as TEST_CSI_DRIVER_FILES env. var., see its documentation for + details. The file must be present in ${SHARED_DIR}. + dependencies: + - name: "release:latest" + env: OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE + resources: + requests: + cpu: "3" + memory: 600Mi + limits: + memory: 6Gi + documentation: |- + The Openshift E2E step executes the common end-to-end test suite. Step timeout is extended to 8hrs.