From 62c909177c0bef3a6b6a7e1e58f410e8ddaf7bd8 Mon Sep 17 00:00:00 2001 From: Danil-Grigorev Date: Fri, 26 Jul 2024 14:25:06 +0200 Subject: [PATCH] Re-enable RKE2 tests for 0.5.0 version, after migration - Use hosted runner to avoid hitting disk pressure Signed-off-by: Danil-Grigorev --- .../data/cluster-templates/docker-rke2.yaml | 2 ++ .../import-gitops-v3/import_gitops_v3_test.go | 4 +-- .../import-gitops/import_gitops_test.go | 30 ------------------- 3 files changed, 4 insertions(+), 32 deletions(-) diff --git a/test/e2e/data/cluster-templates/docker-rke2.yaml b/test/e2e/data/cluster-templates/docker-rke2.yaml index 44d30500..41be3f37 100644 --- a/test/e2e/data/cluster-templates/docker-rke2.yaml +++ b/test/e2e/data/cluster-templates/docker-rke2.yaml @@ -169,3 +169,5 @@ data: kind: ConfigMap metadata: name: ${CLUSTER_NAME}-lb-config + annotations: + "helm.sh/resource-policy": keep diff --git a/test/e2e/suites/import-gitops-v3/import_gitops_v3_test.go b/test/e2e/suites/import-gitops-v3/import_gitops_v3_test.go index 54eda540..1575a35e 100644 --- a/test/e2e/suites/import-gitops-v3/import_gitops_v3_test.go +++ b/test/e2e/suites/import-gitops-v3/import_gitops_v3_test.go @@ -62,7 +62,7 @@ var _ = Describe("[Docker] [Kubeadm] - [management.cattle.io/v3] Create and dele }) }) -var _ = Describe("[Docker] [RKE2] - [management.cattle.io/v3] Create and delete CAPI cluster functionality should work with namespace auto-import", Label(e2e.DontRunLabel), func() { +var _ = Describe("[Docker] [RKE2] - [management.cattle.io/v3] Create and delete CAPI cluster functionality should work with namespace auto-import", Label(e2e.FullTestLabel), func() { BeforeEach(func() { komega.SetClient(setupClusterResult.BootstrapClusterProxy.GetClient()) komega.SetContext(ctx) @@ -84,7 +84,7 @@ var _ = Describe("[Docker] [RKE2] - [management.cattle.io/v3] Create and delete SkipCleanup: false, SkipDeletionTest: false, LabelNamespace: true, - TestClusterReimport: true, + TestClusterReimport: false, RancherServerURL: hostName, CAPIClusterCreateWaitName: "wait-rancher", DeleteClusterWaitName: "wait-controllers", diff --git a/test/e2e/suites/import-gitops/import_gitops_test.go b/test/e2e/suites/import-gitops/import_gitops_test.go index 3a26cf06..22e19af2 100644 --- a/test/e2e/suites/import-gitops/import_gitops_test.go +++ b/test/e2e/suites/import-gitops/import_gitops_test.go @@ -62,36 +62,6 @@ var _ = Describe("[Docker] [Kubeadm] Create and delete CAPI cluster functionalit }) }) -var _ = Describe("[Docker] [RKE2] Create and delete CAPI cluster functionality should work with namespace auto-import", Label(e2e.DontRunLabel), func() { - BeforeEach(func() { - SetClient(setupClusterResult.BootstrapClusterProxy.GetClient()) - SetContext(ctx) - }) - - specs.CreateUsingGitOpsSpec(ctx, func() specs.CreateUsingGitOpsSpecInput { - return specs.CreateUsingGitOpsSpecInput{ - E2EConfig: e2eConfig, - BootstrapClusterProxy: setupClusterResult.BootstrapClusterProxy, - ClusterctlConfigPath: flagVals.ConfigPath, - ClusterctlBinaryPath: e2eConfig.GetVariable(e2e.ClusterctlBinaryPathVar), - ArtifactFolder: artifactsFolder, - ClusterTemplate: e2e.CAPIDockerRKE2, - ClusterName: "clusterv1-docker-rke2", - ControlPlaneMachineCount: ptr.To[int](1), - WorkerMachineCount: ptr.To[int](1), - GitAddr: giteaResult.GitAddress, - GitAuthSecretName: e2e.AuthSecretName, - SkipCleanup: false, - SkipDeletionTest: false, - LabelNamespace: true, - TestClusterReimport: true, - RancherServerURL: hostName, - CAPIClusterCreateWaitName: "wait-rancher", - DeleteClusterWaitName: "wait-controllers", - } - }) -}) - var _ = Describe("[AWS] [EKS] Create and delete CAPI cluster functionality should work with namespace auto-import", Label(e2e.FullTestLabel), func() { BeforeEach(func() { komega.SetClient(setupClusterResult.BootstrapClusterProxy.GetClient())