Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Change RKE2 E2E cluster template registration method + review Short/Full test labels #760

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

WIP: Change RKE2 E2E cluster template registration method + review Short/Full test labels #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c608905
test: change rke2 template registration method
salasberryfin Sep 30, 2024
3cb34fd
test: run caprke2 test cases when short label
salasberryfin Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions test/e2e/data/cluster-templates/docker-rke2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ spec:
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
version: ${RKE2_VERSION}
registrationMethod: internal-first
#registrationMethod: control-plane-endpoint
rolloutStrategy:
rollingUpdate:
maxSurge: 1
Expand Down
2 changes: 2 additions & 0 deletions test/e2e/specs/import_gitops_mgmtv3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ func CreateMgmtV3UsingGitOpsSpec(ctx context.Context, inputGetter func() CreateM
By("Waiting for the rancher cluster to be ready")
Eventually(func() bool {
Eventually(komega.Get(rancherCluster), input.E2EConfig.GetIntervals(input.BootstrapClusterProxy.GetName(), "wait-rancher")...).Should(Succeed())
fmt.Println("Cluster: ", rancherCluster)
fmt.Println("Cluster conditions: ", rancherCluster.Status.Conditions)
return conditions.IsTrue(rancherCluster, managementv3.ClusterConditionReady)
}, input.E2EConfig.GetIntervals(input.BootstrapClusterProxy.GetName(), "wait-rancher")...).Should(BeTrue())

Expand Down
3 changes: 2 additions & 1 deletion test/e2e/suites/chart-upgrade/chart_upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ import (
capiframework "sigs.k8s.io/cluster-api/test/framework"
)

var _ = Describe("Chart upgrade functionality should work", Label(e2e.ShortTestLabel), func() {
// var _ = Describe("Chart upgrade functionality should work", Label(e2e.ShortTestLabel), func() {
var _ = Describe("Chart upgrade functionality should work", Label(e2e.FullTestLabel), func() {
BeforeEach(func() {
SetClient(setupClusterResult.BootstrapClusterProxy.GetClient())
SetContext(ctx)
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/suites/import-gitops-v3/import_gitops_v3_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/rancher/turtles/test/e2e/specs"
)

var _ = Describe("[Docker] [Kubeadm] - [management.cattle.io/v3] Create and delete CAPI cluster functionality should work with namespace auto-import", Label(e2e.ShortTestLabel), func() {
var _ = Describe("[Docker] [RKE2] - [management.cattle.io/v3] Create and delete CAPI cluster functionality should work with namespace auto-import", Label(e2e.ShortTestLabel), func() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know @Danil-Grigorev saw some memory limits issues on the github runner when using RKE2 in a short run

Copy link
Contributor Author

@salasberryfin salasberryfin Oct 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's probably what I've seen when testing this. Passed locally but failed remotely. Could this be affecting nightly tests too?

BeforeEach(func() {
komega.SetClient(setupClusterResult.BootstrapClusterProxy.GetClient())
komega.SetContext(ctx)
Expand All @@ -42,8 +42,8 @@ var _ = Describe("[Docker] [Kubeadm] - [management.cattle.io/v3] Create and dele
ClusterctlConfigPath: flagVals.ConfigPath,
ClusterctlBinaryPath: e2eConfig.GetVariable(e2e.ClusterctlBinaryPathVar),
ArtifactFolder: artifactsFolder,
ClusterTemplate: e2e.CAPIDockerKubeadm,
ClusterName: "clusterv3-auto-import-kubeadm",
ClusterTemplate: e2e.CAPIDockerRKE2,
ClusterName: "clusterv3-auto-import-rke2",
ControlPlaneMachineCount: ptr.To[int](1),
WorkerMachineCount: ptr.To[int](1),
GitAddr: giteaResult.GitAddress,
Expand All @@ -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.FullTestLabel), func() {
var _ = Describe("[Docker] [Kubeadm] - [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)
Expand All @@ -75,8 +75,8 @@ var _ = Describe("[Docker] [RKE2] - [management.cattle.io/v3] Create and delete
ClusterctlConfigPath: flagVals.ConfigPath,
ClusterctlBinaryPath: e2eConfig.GetVariable(e2e.ClusterctlBinaryPathVar),
ArtifactFolder: artifactsFolder,
ClusterTemplate: e2e.CAPIDockerRKE2,
ClusterName: "clusterv3-auto-import-rke2",
ClusterTemplate: e2e.CAPIDockerKubeadm,
ClusterName: "clusterv3-auto-import-kubeadm",
ControlPlaneMachineCount: ptr.To[int](1),
WorkerMachineCount: ptr.To[int](1),
GitAddr: giteaResult.GitAddress,
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/suites/import-gitops/import_gitops_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"github.com/rancher/turtles/test/e2e/specs"
)

var _ = Describe("[Docker] [Kubeadm] Create and delete CAPI cluster functionality should work with namespace auto-import", Label(e2e.ShortTestLabel), func() {
var _ = Describe("[Docker] [Kubeadm] Create and delete CAPI cluster functionality should work with namespace auto-import", Label(e2e.FullTestLabel), func() {
BeforeEach(func() {
SetClient(setupClusterResult.BootstrapClusterProxy.GetClient())
SetContext(ctx)
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/suites/migrate-gitops/migrate_gitops_provv1_mgmtv3_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ 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() {
var _ = Describe("[Docker] [RKE2] - [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)
Expand All @@ -46,7 +46,7 @@ var _ = Describe("[Docker] [Kubeadm] - [management.cattle.io/v3] Migrate v1 to m
ClusterctlConfigPath: flagVals.ConfigPath,
ClusterctlBinaryPath: e2eConfig.GetVariable(e2e.ClusterctlBinaryPathVar),
ArtifactFolder: artifactsFolder,
ClusterTemplate: e2e.CAPIDockerKubeadm,
ClusterTemplate: e2e.CAPIDockerRKE2,
ClusterName: "clusterv3-migrated",
ControlPlaneMachineCount: ptr.To(1),
WorkerMachineCount: ptr.To(1),
Expand Down
Loading