Refactor HCP test configuration to use external cluster mode

- Replace HC_BACKUP_RESTORE_MODE with TEST_HCP_EXTERNAL flag
- Rename "existing" mode to "external" for clarity
- Move HCP external test args to separate HCP_EXTERNAL_ARGS variable
- Rename hcp_full_backup_restore_suite_test.go to hcp_external_cluster_backup_restore_suite_test.go
- Update test labels from "hcp" to "hcp_external" for external cluster tests
- Simplify Makefile by removing unused HC mode variables from main test-e2e target
- Update documentation to reflect new external cluster test configuration

Author: mgencur

Makefile

@@ -64,13 +64,11 @@ TTL_DURATION ?= 1h
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.32 # Kubernetes version from OpenShift 4.19.x https://openshift-release.apps.ci.l2s4.p1.openshiftapps.com/#4-stable
 
-# HC_BACKUP_RESTORE_MODE is used to run HCP tests against existing HostedControlPlane.
-# Possible values are: create, existing.
-HC_BACKUP_RESTORE_MODE ?= create
-# HC_NAME is the name of the HostedCluster to use for HCP tests when HC_BACKUP_RESTORE_MODE is set to existing.
-# Otherwise, HC_NAME is ignored.
+# HC_NAME is the name of the HostedCluster to use for HCP tests when
+# hc_backup_restore_mode is set to external. Otherwise, HC_NAME is ignored.
 HC_NAME ?= ""
-# HC_KUBECONFIG is the path to the kubeconfig file for the HostedCluster to use for HCP tests when HC_BACKUP_RESTORE_MODE is set to existing.
+# HC_KUBECONFIG is the path to the kubeconfig file for the HostedCluster
+# to use for HCP tests when hc_backup_restore_mode is set to external.
 # Otherwise, HC_KUBECONFIG is ignored.
 HC_KUBECONFIG ?= ""
 
@@ -741,6 +739,8 @@ ARTIFACT_DIR ?= /tmp
 HCO_UPSTREAM ?= false
 TEST_VIRT ?= false
 TEST_HCP ?= false
+TEST_HCP_EXTERNAL ?= false
+HCP_EXTERNAL_ARGS ?= ""
 TEST_CLI ?= false
 SKIP_MUST_GATHER  ?= false
 TEST_UPGRADE ?= false
@@ -762,6 +762,12 @@ ifeq ($(TEST_HCP),true)
 else
 	TEST_FILTER += && (! hcp)
 endif
+ifeq ($(TEST_HCP_EXTERNAL),true)
+	TEST_FILTER += && (hcp_external)
+	HCP_EXTERNAL_ARGS = -hc_backup_restore_mode=external -hc_name=$(HC_NAME) -hc_kubeconfig=$(HC_KUBECONFIG)
+else
+	TEST_FILTER += && (! hcp_external)
+endif
 ifeq ($(TEST_CLI),true)
 	TEST_FILTER += && (cli)
 else
@@ -779,16 +785,14 @@ test-e2e: test-e2e-setup install-ginkgo ## Run E2E tests against OADP operator i
 	-velero_instance_name=$(VELERO_INSTANCE_NAME) \
 	-artifact_dir=$(ARTIFACT_DIR) \
 	-kvm_emulation=$(KVM_EMULATION) \
-	-hc_backup_restore_mode=$(HC_BACKUP_RESTORE_MODE) \
-	-hc_name=$(HC_NAME) \
-	-hc_kubeconfig=$(HC_KUBECONFIG) \
 	-hco_upstream=$(HCO_UPSTREAM) \
         -skipMustGather=$(SKIP_MUST_GATHER) \
 	--ginkgo.vv \
 	--ginkgo.no-color=$(OPENSHIFT_CI) \
 	--ginkgo.label-filter="$(TEST_FILTER)" \
 	--ginkgo.junit-report="$(ARTIFACT_DIR)/junit_report.xml" \
 	--ginkgo.timeout=2h \
+	$(HCP_EXTERNAL_ARGS) \
 	$(GINKGO_ARGS)
 
 .PHONY: test-e2e-cleanup

docs/developer/testing/TESTING.md

@@ -100,13 +100,12 @@ You can also execute make test-e2e with a $GINKGO_ARGS variable set. Example:
 make test-e2e GINKGO_ARGS="--ginkgo.focus='MySQL application DATAMOVER'"
 ```
 
-### Run selected test for HCP against existing HostedControlPlane
+### Run selected test for HCP against external HostedControlPlane
 
 Set common env variables as mentioned above, then run:
 
 ```bash
-TEST_HCP=true \
-HC_BACKUP_RESTORE_MODE=existing \
+TEST_HCP_EXTERNAL=true \
 HC_NAME=hc1 \
 HC_KUBECONFIG=/path/to/kubeconfig/for/hosted/cluster \
 make test-e2e

tests/e2e/hcp_backup_restore_suite_test.go

@@ -18,11 +18,11 @@ type HCBackupRestoreMode string
 
 const (
 	HCModeCreate   HCBackupRestoreMode = "create"   // Create new HostedCluster for test
-	HCModeExisting HCBackupRestoreMode = "existing" // Get existing HostedCluster
-	// TODO: Add HCModeExistingROSA for ROSA where DPA and some other resources are already installed
+	HCModeExternal HCBackupRestoreMode = "external" // Get external HostedCluster
+	// TODO: Add HCModeExternalROSA for ROSA where DPA and some other resources are already installed
 )
 
-// runHCPBackupAndRestore is the unified function that handles both create and existing HC modes
+// runHCPBackupAndRestore is the unified function that handles both create and external HC modes
 func runHCPBackupAndRestore(
 	brCase HCPBackupRestoreCase,
 	updateLastBRcase func(HCPBackupRestoreCase),
@@ -50,8 +50,8 @@ func runHCPBackupAndRestore(
 		// Create new HostedCluster for test
 		h.HostedCluster, err = h.DeployHCManifest(brCase.Template, brCase.Provider, brCase.BackupRestoreCase.Name)
 		gomega.Expect(err).ToNot(gomega.HaveOccurred())
-	case HCModeExisting:
-		// Get existing HostedCluster
+	case HCModeExternal:
+		// Get external HostedCluster
 		h.HostedCluster, err = h.GetHostedCluster(brCase.BackupRestoreCase.Name, libhcp.ClustersNamespace)
 		gomega.Expect(err).ToNot(gomega.HaveOccurred())
 	default:
@@ -65,7 +65,7 @@ func runHCPBackupAndRestore(
 		gomega.Expect(err).ToNot(gomega.HaveOccurred(), "failed to run HCP pre-backup verification: %v", err)
 	}
 
-	if brCase.Mode == HCModeExisting {
+	if brCase.Mode == HCModeExternal {
 		// Pre-backup verification for guest cluster
 		if brCase.PreBackupVerifyGuest != nil {
 			log.Printf("Validating guest cluster pre-backup")
@@ -98,7 +98,7 @@ func runHCPBackupAndRestore(
 		gomega.Expect(err).ToNot(gomega.HaveOccurred(), "failed to run HCP post-restore verification: %v", err)
 	}
 
-	if brCase.Mode == HCModeExisting {
+	if brCase.Mode == HCModeExternal {
 		// Post-restore verification for guest cluster
 		if brCase.PostRestoreVerifyGuest != nil {
 			log.Printf("Validating guest cluster post-restore")
@@ -137,9 +137,6 @@ var _ = ginkgo.Describe("HCP Backup and Restore tests", ginkgo.Ordered, func() {
 
 	// Before All
 	var _ = ginkgo.BeforeAll(func() {
-		if hcBackupRestoreMode == string(HCModeExisting) {
-			ginkgo.Skip("Skipping HCP backup and restore test for existing HCP")
-		}
 		// Wait for CatalogSource to be ready
 		err := libhcp.WaitForCatalogSourceReady(
 			ctx,

tests/e2e/hcp_full_backup_restore_suite_test.go renamed to tests/e2e/hcp_external_cluster_backup_restore_suite_test.go

@@ -13,10 +13,10 @@ import (
 	libhcp "github.com/openshift/oadp-operator/tests/e2e/lib/hcp"
 )
 
-// Full cluster backup and restore tests will skip creating HostedCluster resource. They expect the cluster
+// External cluster backup and restore tests will skip creating HostedCluster resource. They expect the cluster
 // to already have HostedCluster with a data plane.
 // The tests are skipped unless hc_backup_restore_mode flag is properly configured.
-var _ = ginkgo.Describe("HCP full Backup and Restore tests", ginkgo.Ordered, func() {
+var _ = ginkgo.Describe("HCP external cluster Backup and Restore tests", ginkgo.Ordered, func() {
 	var (
 		lastInstallTime time.Time
 		lastBRCase      HCPBackupRestoreCase
@@ -32,7 +32,7 @@ var _ = ginkgo.Describe("HCP full Backup and Restore tests", ginkgo.Ordered, fun
 	}
 
 	var _ = ginkgo.BeforeAll(func() {
-		if hcBackupRestoreMode != string(HCModeExisting) {
+		if hcBackupRestoreMode != string(HCModeExternal) {
 			ginkgo.Skip("Skipping HCP full backup and restore test for non-existent HCP")
 		}
 
@@ -50,13 +50,13 @@ var _ = ginkgo.Describe("HCP full Backup and Restore tests", ginkgo.Ordered, fun
 		tearDownDPAResources(lastBRCase.BackupRestoreCase)
 	})
 
-	ginkgo.It("HCP full backup and restore test", ginkgo.Label("hcp"), func() {
+	ginkgo.It("HCP external cluster backup and restore test", ginkgo.Label("hcp_external"), func() {
 		if ginkgo.CurrentSpecReport().NumAttempts > 1 && !knownFlake {
 			ginkgo.Fail("No known FLAKE found in a previous run, marking test as failed.")
 		}
 
 		runHCPBackupAndRestore(HCPBackupRestoreCase{
-			Mode:                   HCModeExisting,
+			Mode:                   HCModeExternal,
 			PreBackupVerifyGuest:   preBackupVerifyGuest(),
 			PostRestoreVerifyGuest: postBackupVerifyGuest(),
 			BackupRestoreCase: BackupRestoreCase{