From 7fd78758c847abc0ec17b122ba17326dbd904f39 Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Mon, 13 May 2024 18:36:03 +0200 Subject: [PATCH] Drop redundant e2e tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Büringer buringerst@vmware.com --- .../capi_machine_deployment_rollout_test.go | 42 ------------------- test/e2e/md_scale_test.go | 40 ------------------ test/e2e/node_drain_timeout_test.go | 40 ------------------ 3 files changed, 122 deletions(-) delete mode 100644 test/e2e/capi_machine_deployment_rollout_test.go delete mode 100644 test/e2e/md_scale_test.go delete mode 100644 test/e2e/node_drain_timeout_test.go diff --git a/test/e2e/capi_machine_deployment_rollout_test.go b/test/e2e/capi_machine_deployment_rollout_test.go deleted file mode 100644 index 194a97b269..0000000000 --- a/test/e2e/capi_machine_deployment_rollout_test.go +++ /dev/null @@ -1,42 +0,0 @@ -/* -Copyright 2022 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package e2e - -import ( - . "github.com/onsi/ginkgo/v2" - capi_e2e "sigs.k8s.io/cluster-api/test/e2e" - "sigs.k8s.io/cluster-api/test/framework/clusterctl" -) - -var _ = Describe("ClusterAPI Machine Deployment Tests", func() { - const specName = "md-rollout" // copied from CAPI - Context("Running the MachineDeployment rollout spec", func() { - Setup(specName, func(testSpecificSettingsGetter func() testSettings) { - capi_e2e.MachineDeploymentRolloutSpec(ctx, func() capi_e2e.MachineDeploymentRolloutSpecInput { - return capi_e2e.MachineDeploymentRolloutSpecInput{ - E2EConfig: e2eConfig, - ClusterctlConfigPath: testSpecificSettingsGetter().ClusterctlConfigPath, - BootstrapClusterProxy: bootstrapClusterProxy, - ArtifactFolder: artifactFolder, - SkipCleanup: skipCleanup, - Flavor: testSpecificSettingsGetter().FlavorForMode(clusterctl.DefaultFlavor), - PostNamespaceCreated: testSpecificSettingsGetter().PostNamespaceCreatedFunc, - } - }) - }) - }) -}) diff --git a/test/e2e/md_scale_test.go b/test/e2e/md_scale_test.go deleted file mode 100644 index 67f7811453..0000000000 --- a/test/e2e/md_scale_test.go +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2022 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package e2e - -import ( - . "github.com/onsi/ginkgo/v2" - capi_e2e "sigs.k8s.io/cluster-api/test/e2e" - "sigs.k8s.io/cluster-api/test/framework/clusterctl" -) - -var _ = Describe("When testing MachineDeployment scale out/in", func() { - const specName = "md-scale" // copied from CAPI - Setup(specName, func(testSpecificSettingsGetter func() testSettings) { - capi_e2e.MachineDeploymentScaleSpec(ctx, func() capi_e2e.MachineDeploymentScaleSpecInput { - return capi_e2e.MachineDeploymentScaleSpecInput{ - E2EConfig: e2eConfig, - ClusterctlConfigPath: testSpecificSettingsGetter().ClusterctlConfigPath, - BootstrapClusterProxy: bootstrapClusterProxy, - ArtifactFolder: artifactFolder, - SkipCleanup: skipCleanup, - Flavor: testSpecificSettingsGetter().FlavorForMode(clusterctl.DefaultFlavor), - PostNamespaceCreated: testSpecificSettingsGetter().PostNamespaceCreatedFunc, - } - }) - }) -}) diff --git a/test/e2e/node_drain_timeout_test.go b/test/e2e/node_drain_timeout_test.go deleted file mode 100644 index be28fcc4c8..0000000000 --- a/test/e2e/node_drain_timeout_test.go +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2022 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package e2e - -import ( - . "github.com/onsi/ginkgo/v2" - "k8s.io/utils/ptr" - capi_e2e "sigs.k8s.io/cluster-api/test/e2e" -) - -var _ = Describe("When testing node drain timeout", func() { - const specName = "node-drain" // copied from CAPI - Setup(specName, func(testSpecificSettingsGetter func() testSettings) { - capi_e2e.NodeDrainTimeoutSpec(ctx, func() capi_e2e.NodeDrainTimeoutSpecInput { - return capi_e2e.NodeDrainTimeoutSpecInput{ - E2EConfig: e2eConfig, - ClusterctlConfigPath: testSpecificSettingsGetter().ClusterctlConfigPath, - BootstrapClusterProxy: bootstrapClusterProxy, - ArtifactFolder: artifactFolder, - SkipCleanup: skipCleanup, - Flavor: ptr.To(testSpecificSettingsGetter().FlavorForMode("node-drain")), - PostNamespaceCreated: testSpecificSettingsGetter().PostNamespaceCreatedFunc, - } - }) - }) -})