Run e2e upgrade tests in isolation

Signed-off-by: Andrea Mazzotti <[email protected]>

Author: anmazzotti

.github/workflows/e2e.yml

@@ -31,3 +31,29 @@ jobs:
           name: e2e-artifacts
           path: _artifacts
           if-no-files-found: ignore
+  e2e-tests-upgrade:
+    runs-on: runs-on,runner=4cpu-linux-x64,run-id=${{ github.run_id }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - name: Install Go
+        uses: actions/setup-go@v6
+        with:
+          go-version-file: go.mod
+      - name: Setup kind
+        uses: helm/[email protected]
+        with:
+          install_only: true
+      - name: Run E2E tests
+        env:
+          GINKGO_LABEL_FILTER: upgrade
+        run: make test-e2e
+      - name: Archive artifacts
+        if: always()
+        uses: actions/[email protected]
+        with:
+          name: e2e-upgrade-artifacts
+          path: _artifacts
+          if-no-files-found: ignore

Makefile

@@ -397,6 +397,7 @@ kubectl: # Download kubectl cli into tools bin folder
 
 # Allow overriding the e2e configurations
 GINKGO_FOCUS ?=
+GINKGO_LABEL_FILTER ?= "default"
 GINKGO_SKIP ?= "Pivot" # See: https://github.com/rancher/cluster-api-provider-rke2/issues/691 
 GINKGO_NODES ?= 1
 GINKGO_NOCOLOR ?= false
@@ -411,7 +412,7 @@ SKIP_CREATE_MGMT_CLUSTER ?= false
 .PHONY: test-e2e-run
 test-e2e-run: $(GINKGO) $(KUSTOMIZE) kubectl e2e-image inotify-check ## Run the end-to-end tests
 	LOCAL_IMAGES="$(LOCAL_IMAGES)" CAPI_KUSTOMIZE_PATH="$(KUSTOMIZE)" $(GINKGO) -v -poll-progress-after=$(GINKGO_POLL_PROGRESS_AFTER) -poll-progress-interval=$(GINKGO_POLL_PROGRESS_INTERVAL) \
-	--tags=e2e --focus="$(GINKGO_FOCUS)" --skip="$(GINKGO_SKIP)" --nodes=$(GINKGO_NODES) --no-color=$(GINKGO_NOCOLOR) \
+	--tags=e2e --focus="$(GINKGO_FOCUS)" --label-filter="$(GINKGO_LABEL_FILTER)" --skip="$(GINKGO_SKIP)" --nodes=$(GINKGO_NODES) --no-color=$(GINKGO_NOCOLOR) \
 	--timeout=$(GINKGO_TIMEOUT) --output-dir="$(ARTIFACTS)" --junit-report="junit.e2e_suite.1.xml" $(GINKGO_ARGS) ./test/e2e -- \
 		-e2e.artifacts-folder="$(ARTIFACTS)" \
 		-e2e.config="$(E2E_CONF_FILE)" \

metadata.yaml

@@ -71,4 +71,4 @@ releaseSeries:
     contract: v1beta1
   - major: 0
     minor: 22
-    contract: v1beta1
+    contract: v1beta2

test/e2e/const.go

@@ -32,6 +32,14 @@ const (
 	timeout480s = 480
 )
 
+const (
+	// DefaultTestsLabel is used for all default tests that run on the same test management cluster.
+	DefaultTestsLabel = "default"
+	// UpgradeTestsLabel is used to run upgrade tests standalone.
+	// These tests may need to install a different version of CAPI, requiring management cluster isolation.
+	UpgradeTestsLabel = "upgrade"
+)
+
 var (
 	//go:embed data/infrastructure/clusterclass-template-docker.yaml
 	ClusterClassDocker []byte

test/e2e/e2e_clusterclass_test.go

@@ -34,7 +34,7 @@ import (
 	"sigs.k8s.io/cluster-api/util"
 )
 
-var _ = Describe("Cluster Class provisioning", func() {
+var _ = Describe("Cluster Class provisioning", Label(DefaultTestsLabel), func() {
 	var (
 		specName            = "cluster-class-provisioning"
 		namespace           *corev1.Namespace

test/e2e/e2e_external_datastore_test.go

@@ -33,7 +33,7 @@ import (
 	"sigs.k8s.io/cluster-api/util"
 )
 
-var _ = Describe("External Datastore", func() {
+var _ = Describe("External Datastore", Label(DefaultTestsLabel), func() {
 	var (
 		specName            = "create-workload-cluster-with-external-datastore"
 		namespace           *corev1.Namespace

test/e2e/e2e_in_place_propagation_test.go

@@ -41,7 +41,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-var _ = Describe("In-place propagation", func() {
+var _ = Describe("In-place propagation", Label(DefaultTestsLabel), func() {
 	var (
 		specName            = "in-place-propagation"
 		namespace           *corev1.Namespace
@@ -123,7 +123,7 @@ var _ = Describe("In-place propagation", func() {
 
 			By("Verifying the cluster is available")
 			framework.VerifyClusterAvailable(ctx, framework.VerifyClusterAvailableInput{
-				Getter: bootstrapClusterProxy.GetClient(),  
+				Getter:    bootstrapClusterProxy.GetClient(),
 				Name:      result.Cluster.Name,
 				Namespace: result.Cluster.Namespace,
 			})

test/e2e/e2e_pivot_test.go

@@ -37,7 +37,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-var _ = Describe("Bootstrap & Pivot", func() {
+var _ = Describe("Bootstrap & Pivot", Label(DefaultTestsLabel), func() {
 	var (
 		specName            = "bootstrap-pivot-cluster"
 		namespace           *corev1.Namespace

test/e2e/e2e_test.go

@@ -38,7 +38,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-var _ = Describe("Workload cluster creation", func() {
+var _ = Describe("Workload cluster creation", Label(DefaultTestsLabel), func() {
 	var (
 		specName            = "create-workload-cluster"
 		namespace           *corev1.Namespace

test/e2e/e2e_upgrade_test.go

@@ -44,7 +44,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-var _ = Describe("Provider upgrade", func() {
+var _ = Describe("Provider upgrade", Label(UpgradeTestsLabel), func() {
 	var (
 		specName            = "provider-upgrade"
 		namespace           *corev1.Namespace