From 8561f180aab4ff16e4f0219b7d71cb1dc23a4e1c Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 22 Aug 2018 16:42:53 -0700 Subject: [PATCH] ci-operator/templates: Remove TEST_SUITE(_SERIAL) The last consumer was removed in 7ea9239f (Change job focus for image-registry e2e, 2018-05-21, #874). And the origin extended.test deprecated -suite in favor of focus in openshift/origin@83d9db89 (Make focus and skip a lot easier to use in extended tests, 2017-08-22, openshift/origin#15915). --- .../templates/cluster-launch-e2e-gmontero-testing.yaml | 10 ++++------ ci-operator/templates/cluster-launch-e2e.yaml | 10 ++++------ .../templates/cluster-launch-installer-e2e.yaml | 10 ++++------ ci-operator/templates/cluster-launch-src.yaml | 2 -- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/ci-operator/templates/cluster-launch-e2e-gmontero-testing.yaml b/ci-operator/templates/cluster-launch-e2e-gmontero-testing.yaml index 3d2b12c81ea2..27c88ff2df28 100644 --- a/ci-operator/templates/cluster-launch-e2e-gmontero-testing.yaml +++ b/ci-operator/templates/cluster-launch-e2e-gmontero-testing.yaml @@ -18,11 +18,9 @@ parameters: required: true - name: CLUSTER_TYPE required: true -- name: TEST_SUITE - name: TEST_FOCUS - name: TEST_SKIP value: "\\[local\\]" -- name: TEST_SUITE_SERIAL - name: TEST_FOCUS_SERIAL - name: TEST_SKIP_SERIAL value: "\\[local\\]" @@ -233,15 +231,15 @@ objects: # autodetected from the running cluster. # TODO: bump nodes up to 40 again set -x - if [[ -n "${TEST_SUITE}" || -n "${TEST_FOCUS}" ]]; then + if [[ -n "${TEST_FOCUS}" ]]; then ginkgo -v -noColor -nodes=30 $( which extended.test ) -- \ - -suite "${TEST_SUITE}" -ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \ + -ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \ -e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit \ -test.timeout=2h ${PROVIDER_ARGS-} || rc=$? fi - if [[ -n "${TEST_SUITE_SERIAL}" || -n "${TEST_FOCUS_SERIAL}" ]]; then + if [[ -n "${TEST_FOCUS_SERIAL}" ]]; then ginkgo -v -noColor -nodes=1 $( which extended.test ) -- \ - -suite "${TEST_SUITE_SERIAL}" -ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \ + -ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \ -e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit/serial \ -test.timeout=2h ${PROVIDER_ARGS-} || rc=$? fi diff --git a/ci-operator/templates/cluster-launch-e2e.yaml b/ci-operator/templates/cluster-launch-e2e.yaml index 4f78c9adaa31..5843ed2497c2 100644 --- a/ci-operator/templates/cluster-launch-e2e.yaml +++ b/ci-operator/templates/cluster-launch-e2e.yaml @@ -18,11 +18,9 @@ parameters: required: true - name: CLUSTER_TYPE required: true -- name: TEST_SUITE - name: TEST_FOCUS - name: TEST_SKIP value: "\\[local\\]" -- name: TEST_SUITE_SERIAL - name: TEST_FOCUS_SERIAL - name: TEST_SKIP_SERIAL value: "\\[local\\]" @@ -149,15 +147,15 @@ objects: # autodetected from the running cluster. # TODO: bump nodes up to 40 again set -x - if [[ -n "${TEST_SUITE}" || -n "${TEST_FOCUS}" ]]; then + if [[ -n "${TEST_FOCUS}" ]]; then ginkgo -v -noColor -nodes=30 $( which extended.test ) -- \ - -suite "${TEST_SUITE}" -ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \ + -ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \ -e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit \ -test.timeout=2h ${PROVIDER_ARGS-} || rc=$? fi - if [[ -n "${TEST_SUITE_SERIAL}" || -n "${TEST_FOCUS_SERIAL}" ]]; then + if [[ -n "${TEST_FOCUS_SERIAL}" ]]; then ginkgo -v -noColor -nodes=1 $( which extended.test ) -- \ - -suite "${TEST_SUITE_SERIAL}" -ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \ + -ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \ -e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit/serial \ -test.timeout=2h ${PROVIDER_ARGS-} || rc=$? fi diff --git a/ci-operator/templates/cluster-launch-installer-e2e.yaml b/ci-operator/templates/cluster-launch-installer-e2e.yaml index 1c6a55195a62..c90d669ebfad 100644 --- a/ci-operator/templates/cluster-launch-installer-e2e.yaml +++ b/ci-operator/templates/cluster-launch-installer-e2e.yaml @@ -16,10 +16,8 @@ parameters: required: true - name: CLUSTER_TYPE required: true -- name: TEST_SUITE - name: TEST_FOCUS - name: TEST_SKIP -- name: TEST_SUITE_SERIAL - name: TEST_FOCUS_SERIAL - name: TEST_SKIP_SERIAL @@ -144,15 +142,15 @@ objects: # autodetected from the running cluster. # TODO: bump nodes up to 40 again set -x - if [[ -n "${TEST_SUITE}" || -n "${TEST_FOCUS}" ]]; then + if [[ -n "${TEST_FOCUS}" ]]; then ginkgo -v -noColor -nodes=30 $( which extended.test ) -- \ - -suite "${TEST_SUITE}" -ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \ + -ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \ -e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit \ -test.timeout=10m ${PROVIDER_ARGS-} || rc=$? fi - if [[ -n "${TEST_SUITE_SERIAL}" || -n "${TEST_FOCUS_SERIAL}" ]]; then + if [[ -n "${TEST_FOCUS_SERIAL}" ]]; then ginkgo -v -noColor -nodes=1 $( which extended.test ) -- \ - -suite "${TEST_SUITE_SERIAL}" -ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \ + -ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \ -e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit/serial \ -test.timeout=20m ${PROVIDER_ARGS-} || rc=$? fi diff --git a/ci-operator/templates/cluster-launch-src.yaml b/ci-operator/templates/cluster-launch-src.yaml index f578b9d553f7..8995c3e8bfcc 100644 --- a/ci-operator/templates/cluster-launch-src.yaml +++ b/ci-operator/templates/cluster-launch-src.yaml @@ -20,11 +20,9 @@ parameters: required: true - name: CLUSTER_TYPE required: true -- name: TEST_SUITE - name: TEST_FOCUS - name: TEST_SKIP value: "\\[local\\]" -- name: TEST_SUITE_SERIAL - name: TEST_FOCUS_SERIAL - name: TEST_SKIP_SERIAL value: "\\[local\\]"