Skip to content

Commit

Permalink
Separate auto-migration tests in a suite
Browse files Browse the repository at this point in the history
Signed-off-by: Danil-Grigorev <danil.grigorev@suse.com>
  • Loading branch information
Danil-Grigorev committed Jun 27, 2024
1 parent d7ecf2b commit 6856817
Show file tree
Hide file tree
Showing 3 changed files with 385 additions and 35 deletions.
1 change: 1 addition & 0 deletions .github/workflows/e2e-short.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Run short e2e tests
on:
pull_request:
types: [opened, edited, synchronize, reopened, labeled, unlabeled]
push:

jobs:
e2e:
Expand Down
35 changes: 0 additions & 35 deletions test/e2e/suites/import-gitops/import_gitops_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,41 +32,6 @@ import (
"github.com/rancher/turtles/test/e2e/specs"
)

var _ = Describe("[Docker] [Kubeadm] - [management.cattle.io/v3] Migrate v1 to management v3 cluster functionality should work", Label(e2e.ShortTestLabel), func() {
BeforeEach(func() {
komega.SetClient(setupClusterResult.BootstrapClusterProxy.GetClient())
komega.SetContext(ctx)
})

specs.MigrateToV3UsingGitOpsSpec(ctx, func() specs.MigrateToV3UsingGitOpsSpecInput {
return specs.MigrateToV3UsingGitOpsSpecInput{
HelmBinaryPath: flagVals.HelmBinaryPath,
ChartPath: flagVals.ChartPath,
E2EConfig: e2eConfig,
BootstrapClusterProxy: setupClusterResult.BootstrapClusterProxy,
ClusterctlConfigPath: flagVals.ConfigPath,
ClusterctlBinaryPath: flagVals.ClusterctlBinaryPath,
ArtifactFolder: flagVals.ArtifactFolder,
ClusterTemplate: e2e.CAPIDockerKubeadm,
ClusterName: "clusterv3-migrated",
ControlPlaneMachineCount: ptr.To(1),
WorkerMachineCount: ptr.To(1),
GitAddr: giteaResult.GitAddress,
GitAuthSecretName: e2e.AuthSecretName,
SkipCleanup: false,
SkipDeletionTest: false,
LabelNamespace: true,
TestClusterReimport: true,
RancherServerURL: hostName,
CAPIClusterCreateWaitName: "wait-rancher",
DeleteClusterWaitName: "wait-controllers",
CapiClusterOwnerLabel: e2e.CapiClusterOwnerLabel,
CapiClusterOwnerNamespaceLabel: e2e.CapiClusterOwnerNamespaceLabel,
OwnedLabelName: e2e.OwnedLabelName,
}
})
})

var _ = Describe("[Docker] [Kubeadm] Create and delete CAPI cluster functionality should work with namespace auto-import", Label(e2e.ShortTestLabel), func() {
BeforeEach(func() {
SetClient(setupClusterResult.BootstrapClusterProxy.GetClient())
Expand Down
Loading

0 comments on commit 6856817

Please sign in to comment.