diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.12.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.12.yaml index 029326249d8d3..4092667e2fbde 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.12.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.12.yaml @@ -314,21 +314,6 @@ tests: NODE_TUNING: "true" TEST_TYPE: conformance-parallel workflow: openshift-e2e-libvirt -- as: ocp-heavy-build-ovn-remote-libvirt-s390x - capabilities: - - sshd-bastion - cron: 0 0 25 12 * - steps: - cluster_profile: libvirt-s390x-2 - dependencies: - OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:s390x-latest - env: - ARCH: s390x - BRANCH: "4.12" - BUTANE_RELEASE: 4.12.0 - NODE_TUNING: "true" - TEST_TYPE: heavy-build - workflow: openshift-e2e-libvirt - as: ocp-image-ecosystem-ovn-remote-libvirt-s390x capabilities: - sshd-bastion diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.13.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.13.yaml index fdd905bfb9b53..99feb5f0b4064 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.13.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.13.yaml @@ -328,20 +328,6 @@ tests: STATIC_POD_CHECK_WORKAROUND: "true" TEST_TYPE: conformance-parallel workflow: openshift-e2e-libvirt -- as: ocp-heavy-build-ovn-remote-libvirt-s390x - capabilities: - - sshd-bastion - cron: 0 0 2 1 * - steps: - cluster_profile: libvirt-s390x-2 - dependencies: - OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:s390x-latest - env: - ARCH: s390x - BRANCH: "4.13" - NODE_TUNING: "true" - TEST_TYPE: heavy-build - workflow: openshift-e2e-libvirt - as: ocp-image-ecosystem-ovn-remote-libvirt-s390x capabilities: - sshd-bastion diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.14.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.14.yaml index 964d38ed339d9..68b47d7a87f1f 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.14.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.14.yaml @@ -384,20 +384,6 @@ tests: NODE_TUNING: "true" TEST_TYPE: conformance-parallel workflow: openshift-e2e-libvirt -- as: ocp-heavy-build-ovn-remote-libvirt-s390x - capabilities: - - sshd-bastion - cron: 0 0 10 1 * - steps: - cluster_profile: libvirt-s390x-1 - dependencies: - OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:s390x-latest - env: - ARCH: s390x - BRANCH: "4.14" - NODE_TUNING: "true" - TEST_TYPE: heavy-build - workflow: openshift-e2e-libvirt - as: ocp-image-ecosystem-ovn-remote-libvirt-s390x capabilities: - sshd-bastion diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.15.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.15.yaml index c404f75190e17..a798912a352dd 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.15.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.15.yaml @@ -409,20 +409,6 @@ tests: TEST_TYPE: conformance-parallel USE_RAMFS: "true" workflow: openshift-e2e-libvirt-upi-heterogeneous -- as: ocp-heavy-build-ovn-remote-libvirt-s390x - capabilities: - - sshd-bastion - cron: 0 0 18 1 * - steps: - cluster_profile: libvirt-s390x-2 - dependencies: - OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:s390x-latest - env: - ARCH: s390x - BRANCH: "4.15" - NODE_TUNING: "true" - TEST_TYPE: heavy-build - workflow: openshift-e2e-libvirt - as: ocp-image-ecosystem-ovn-remote-libvirt-s390x capabilities: - sshd-bastion diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.16.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.16.yaml index 5af3985443027..06ce2196ca26b 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.16.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.16.yaml @@ -400,22 +400,6 @@ tests: TEST_TYPE: conformance-parallel USE_RAMFS: "true" workflow: openshift-e2e-libvirt-upi-heterogeneous -- as: ocp-heavy-build-ovn-remote-libvirt-s390x - capabilities: - - intranet - cron: 0 0 26 1 * - steps: - cluster_profile: libvirt-s390x-vpn - dependencies: - OPENSHIFT_INSTALL_TARGET: release:s390x-latest - env: - ARCH: s390x - BRANCH: "4.16" - ETCD_DISK_SPEED: slow - NODE_TUNING: "true" - TEST_TYPE: heavy-build - USE_EXTERNAL_DNS: "true" - workflow: openshift-e2e-libvirt-vpn - as: ocp-image-ecosystem-ovn-remote-libvirt-s390x capabilities: - intranet diff --git a/ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml b/ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml index d08400a905182..1d068979236b3 100644 --- a/ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml +++ b/ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml @@ -5252,90 +5252,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build01 - cron: 0 0 25 12 * - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: openshift - repo: multiarch - labels: - capability/sshd-bastion: sshd-bastion - ci-operator.openshift.io/cloud: libvirt-s390x-2 - ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-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-main-nightly-4.12-ocp-heavy-build-ovn-remote-libvirt-s390x - 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=ocp-heavy-build-ovn-remote-libvirt-s390x - - --variant=nightly-4.12 - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - 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 - agent: kubernetes cluster: build11 cron: 0 0 29 1 * @@ -8254,90 +8170,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build01 - cron: 0 0 2 1 * - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: openshift - repo: multiarch - labels: - capability/sshd-bastion: sshd-bastion - ci-operator.openshift.io/cloud: libvirt-s390x-2 - ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-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-main-nightly-4.13-ocp-heavy-build-ovn-remote-libvirt-s390x - 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=ocp-heavy-build-ovn-remote-libvirt-s390x - - --variant=nightly-4.13 - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - 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 - agent: kubernetes cluster: build11 cron: 0 0 13 2 * @@ -11920,90 +11752,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build01 - cron: 0 0 10 1 * - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: openshift - repo: multiarch - labels: - capability/sshd-bastion: sshd-bastion - ci-operator.openshift.io/cloud: libvirt-s390x-1 - ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-1 - ci-operator.openshift.io/variant: nightly-4.14 - ci.openshift.io/generator: prowgen - job-release: "4.14" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-multiarch-main-nightly-4.14-ocp-heavy-build-ovn-remote-libvirt-s390x - 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=ocp-heavy-build-ovn-remote-libvirt-s390x - - --variant=nightly-4.14 - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - 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 - agent: kubernetes cluster: build11 cron: 28 5 13 5 * @@ -15751,90 +15499,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build01 - cron: 0 0 18 1 * - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: openshift - repo: multiarch - labels: - capability/sshd-bastion: sshd-bastion - ci-operator.openshift.io/cloud: libvirt-s390x-2 - ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-2 - ci-operator.openshift.io/variant: nightly-4.15 - ci.openshift.io/generator: prowgen - job-release: "4.15" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-multiarch-main-nightly-4.15-ocp-heavy-build-ovn-remote-libvirt-s390x - 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=ocp-heavy-build-ovn-remote-libvirt-s390x - - --variant=nightly-4.15 - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - 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 - agent: kubernetes cluster: build11 cron: 21 1 10 7 * @@ -20247,90 +19911,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build09 - cron: 0 0 26 1 * - decorate: true - decoration_config: - skip_cloning: true - extra_refs: - - base_ref: main - org: openshift - repo: multiarch - labels: - capability/intranet: intranet - ci-operator.openshift.io/cloud: libvirt-s390x-vpn - ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-vpn - ci-operator.openshift.io/variant: nightly-4.16 - ci.openshift.io/generator: prowgen - job-release: "4.16" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-heavy-build-ovn-remote-libvirt-s390x - 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=ocp-heavy-build-ovn-remote-libvirt-s390x - - --variant=nightly-4.16 - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - 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 - agent: kubernetes cluster: build11 cron: 17 5 7 6 * diff --git a/ci-operator/step-registry/openshift/e2e/libvirt/conf/openshift-e2e-libvirt-conf-commands.sh b/ci-operator/step-registry/openshift/e2e/libvirt/conf/openshift-e2e-libvirt-conf-commands.sh index 688104793e70a..beed2c70786dd 100644 --- a/ci-operator/step-registry/openshift/e2e/libvirt/conf/openshift-e2e-libvirt-conf-commands.sh +++ b/ci-operator/step-registry/openshift/e2e/libvirt/conf/openshift-e2e-libvirt-conf-commands.sh @@ -324,41 +324,6 @@ fi # elif echo ${BRANCH} | awk -F. '{ if ((($1 == "main") || ($1 == "master")) || (($1 == 4) && ($2 >= 17 && $2 <= 19))) { exit 0 } else { exit 1 } }' && [ "${ARCH}" == "ppc64le" ]; then # -# s390x "yellow zone" (through 4.16): run bandwidth-heavy build/image tests in a separate periodic and exclude them -# from conformance-parallel. From 4.17 onward, Z homogeneous (VPN) jobs are off yellow zone, so the full -# parallel suite runs in the main conformance job only. -if echo "${BRANCH}" | awk -F. '{ if (($1 == 4) && ($2 <= 16)) { exit 0 } else { exit 1 } }' && [[ "${TEST_TYPE}" == "conformance-parallel" || "${TEST_TYPE}" == "heavy-build" ]] && [ "${ARCH}" != "ppc64le" ]; then - cat > "${SHARED_DIR}/temp_tests" << EOF -"[sig-builds][Feature:Builds] Multi-stage image builds should succeed [apigroup:build.openshift.io] [Skipped:Disconnected] [Suite:openshift/conformance/parallel]" -"[sig-apps][Feature:DeploymentConfig] deploymentconfigs with multiple image change triggers should run a successful deployment with a trigger used by different containers [apigroup:apps.openshift.io][apigroup:image.openshift.io] [Skipped:Disconnected] [Suite:openshift/conformance/parallel]" -"[sig-apps][Feature:DeploymentConfig] deploymentconfigs with multiple image change triggers should run a successful deployment with multiple triggers [apigroup:apps.openshift.io][apigroup:image.openshift.io] [Skipped:Disconnected] [Suite:openshift/conformance/parallel]" -"[sig-builds][Feature:Builds] Multi-stage image builds should succeed [apigroup:build.openshift.io] [Skipped:Disconnected] [Suite:openshift/conformance/parallel]" -"[sig-builds][Feature:Builds] Optimized image builds should succeed [apigroup:build.openshift.io] [Skipped:Disconnected] [Suite:openshift/conformance/parallel]" -"[sig-builds][Feature:Builds] build without output image building from templates should create an image from a docker template without an output image reference defined [apigroup:build.openshift.io] [Skipped:Disconnected] [Suite:openshift/conformance/parallel]" -"[sig-builds][Feature:Builds] custom build with buildah being created from new-build should complete build with custom builder image [apigroup:build.openshift.io] [Skipped:Disconnected] [Suite:openshift/conformance/parallel]" -"[sig-builds][Feature:Builds] prune builds based on settings in the buildconfig should prune completed builds based on the successfulBuildsHistoryLimit setting [apigroup:build.openshift.io] [Skipped:Disconnected] [Suite:openshift/conformance/parallel]" -"[sig-builds][Feature:Builds] result image should have proper labels set Docker build from a template should create a image from \"test-docker-build.json\" template with proper Docker labels [apigroup:build.openshift.io][apigroup:image.openshift.io] [Skipped:Disconnected] [Suite:openshift/conformance/parallel]" -"[sig-builds][Feature:Builds] verify /run filesystem contents do not have unexpected content using a simple Docker Strategy Build [apigroup:build.openshift.io] [Skipped:Disconnected] [Suite:openshift/conformance/parallel]" -"[sig-builds][Feature:Builds][pullsecret] docker build using a pull secret Building from a template should create a docker build that pulls using a secret run it [apigroup:build.openshift.io] [Skipped:Disconnected] [Suite:openshift/conformance/parallel]" -"[sig-builds][Feature:Builds][timing] capture build stages and durations should record build stages and durations for docker [apigroup:build.openshift.io] [Skipped:Disconnected] [Suite:openshift/conformance/parallel]" -"[sig-builds][Feature:Builds][valueFrom] process valueFrom in build strategy environment variables should successfully resolve valueFrom in docker build environment variables [apigroup:build.openshift.io] [Skipped:Disconnected] [Suite:openshift/conformance/parallel]" -"[sig-cli] oc debug deployment configs from a build [apigroup:image.openshift.io][apigroup:apps.openshift.io] [Skipped:Disconnected] [Suite:openshift/conformance/parallel]" -"[sig-imageregistry][Feature:ImageAppend] Image append should create images by appending them [apigroup:image.openshift.io] [Skipped:Disconnected] [Suite:openshift/conformance/parallel]" -"[sig-imageregistry][Feature:ImageExtract] Image extract should extract content from an image [apigroup:image.openshift.io] [Skipped:Disconnected] [Suite:openshift/conformance/parallel]" -"[sig-imageregistry][Feature:ImageLayers] Image layer subresource should return layers from tagged images [apigroup:image.openshift.io][apigroup:build.openshift.io] [Skipped:Disconnected] [Suite:openshift/conformance/parallel]" -"[sig-imageregistry][Feature:Image] oc tag should change image reference for internal images [apigroup:build.openshift.io][apigroup:image.openshift.io] [Skipped:Disconnected] [Suite:openshift/conformance/parallel]" -"[sig-builds][Feature:Builds] build can reference a cluster service with a build being created from new-build should be able to run a build that references a cluster service [apigroup:build.openshift.io] [Skipped:Disconnected] [Skipped:Proxy] [Suite:openshift/conformance/parallel]" -"[sig-builds][Feature:Builds] verify /run filesystem contents are writeable using a simple Docker Strategy Build [apigroup:build.openshift.io] [Skipped:Disconnected] [Suite:openshift/conformance/parallel]" -EOF - if [ "${TEST_TYPE}" == "conformance-parallel" ]; then - echo "Adding heavy_build tests to the excluded test list (s390x yellow zone through 4.16)..." - cat ${SHARED_DIR}/temp_tests >> ${SHARED_DIR}/excluded_tests - else - echo "Creating test list from the heavy_build test list..." - mv ${SHARED_DIR}/temp_tests ${SHARED_DIR}/tests - fi -fi - # Skip the following tests for clusters with multi-architecture compute nodes # # The list of skipped tests is the result of the following regular expression against the diff --git a/ci-operator/step-registry/openshift/e2e/libvirt/test/openshift-e2e-libvirt-test-commands.sh b/ci-operator/step-registry/openshift/e2e/libvirt/test/openshift-e2e-libvirt-test-commands.sh index 9661c386bbf98..4e87484892428 100644 --- a/ci-operator/step-registry/openshift/e2e/libvirt/test/openshift-e2e-libvirt-test-commands.sh +++ b/ci-operator/step-registry/openshift/e2e/libvirt/test/openshift-e2e-libvirt-test-commands.sh @@ -347,20 +347,6 @@ export KUBE_TEST_REPO_LIST=${SHARED_DIR}/kube-test-repo-list wait "$!" } -function heavy_build() { - TEST_ARGS="${TEST_ARGS:-} --file ${SHARED_DIR}/tests" - VERBOSITY="" # "--v 9" - - set -x - openshift-tests run \ - ${VERBOSITY} \ - "${TEST_SUITE}" \ - ${TEST_ARGS:-} \ - -o "${ARTIFACT_DIR}/e2e.log" \ - --junit-dir "${ARTIFACT_DIR}/junit" & - wait "$!" -} - echo "$(date +%s)" > "${SHARED_DIR}/TEST_TIME_TEST_START" trap 'echo "$(date +%s)" > "${SHARED_DIR}/TEST_TIME_TEST_END"' EXIT @@ -398,9 +384,6 @@ jenkins-e2e-rhel-only) image-ecosystem) TEST_LIMIT_START_TIME="$(date +%s)" TEST_SUITE=openshift/image-ecosystem suite ;; -heavy-build) - TEST_LIMIT_START_TIME="$(date +%s)" TEST_SUITE=openshift/conformance/parallel heavy_build - ;; upgrade) upgrade ;;