From 16120ffd25de8ee61faa34538e538fd5979eff53 Mon Sep 17 00:00:00 2001
From: Sid Shukla <sid.shukla@nutanix.com>
Date: Mon, 3 Jun 2024 12:06:35 +0200
Subject: [PATCH] Quote label filters on ci-e2e.sh on main branch (#434) (#443)

This is to ensure the full value of LABEL_FILTERS gets propagated.
---
 scripts/ci-e2e.sh                 | 4 ++--
 test/e2e/md_rollout_test.go       | 2 +-
 test/e2e/md_scale_test.go         | 4 ++--
 test/e2e/mhc_remediations_test.go | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh
index 549e46e055..f0f5b3da0c 100755
--- a/scripts/ci-e2e.sh
+++ b/scripts/ci-e2e.sh
@@ -29,7 +29,7 @@ export PATH="${REPO_ROOT}/hack/tools/bin:${PATH}"
 
 # Override e2e conf values with CI specific environment variables
 MAKE_TARGET=${MAKE_TARGET}
-LABEL_FILTERS=${LABEL_FILTERS}
+LABEL_FILTERS="${LABEL_FILTERS}"
 KUBERNETES_VERSION_MANAGEMENT=${KUBERNETES_VERSION_MANAGEMENT}
 NUTANIX_ENDPOINT=${NUTANIX_ENDPOINT}
 NUTANIX_USER=${NUTANIX_USER}
@@ -43,4 +43,4 @@ NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME=${NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME}
 NUTANIX_SUBNET_NAME=${NUTANIX_SUBNET_NAME}
 
 # Run e2e tests
-make ${MAKE_TARGET} LABEL_FILTERS=${LABEL_FILTERS}
\ No newline at end of file
+make ${MAKE_TARGET} LABEL_FILTERS="${LABEL_FILTERS}"
diff --git a/test/e2e/md_rollout_test.go b/test/e2e/md_rollout_test.go
index 499bfeaedd..b9f697ca9d 100644
--- a/test/e2e/md_rollout_test.go
+++ b/test/e2e/md_rollout_test.go
@@ -24,7 +24,7 @@ import (
 	capi_e2e "sigs.k8s.io/cluster-api/test/e2e"
 )
 
-var _ = Describe("When testing MachineDeployment rolling upgrades", Label("md-rolling-upgrades", "slow", "network"), func() {
+var _ = Describe("When testing MachineDeployment rolling upgrades", Label("scaling", "md-rolling-upgrades", "slow", "network"), func() {
 	capi_e2e.MachineDeploymentRolloutSpec(ctx, func() capi_e2e.MachineDeploymentRolloutSpecInput {
 		return capi_e2e.MachineDeploymentRolloutSpecInput{
 			E2EConfig:             e2eConfig,
diff --git a/test/e2e/md_scale_test.go b/test/e2e/md_scale_test.go
index c6dc1def59..3744a922f3 100644
--- a/test/e2e/md_scale_test.go
+++ b/test/e2e/md_scale_test.go
@@ -34,7 +34,7 @@ import (
 	"sigs.k8s.io/cluster-api/util"
 )
 
-var _ = Describe("When testing MachineDeployment scale out/in", Label("md-scale-out-in", "slow", "network"), func() {
+var _ = Describe("When testing MachineDeployment scale out/in", Label("scaling", "md-scale-out-in", "slow", "network"), func() {
 	capi_e2e.MachineDeploymentScaleSpec(ctx, func() capi_e2e.MachineDeploymentScaleSpecInput {
 		return capi_e2e.MachineDeploymentScaleSpecInput{
 			E2EConfig:             e2eConfig,
@@ -47,7 +47,7 @@ var _ = Describe("When testing MachineDeployment scale out/in", Label("md-scale-
 })
 
 // Label `only-for-validation` is used to run this test only for validation and not as part of the regular test suite.
-var _ = Describe("When testing MachineDeployment scale up/down from 10 replicas to 20 replicas to 10 again", Label("md-scale-up-down", "slow", "network", "only-for-validation"), func() {
+var _ = Describe("When testing MachineDeployment scale up/down from 10 replicas to 20 replicas to 10 again", Label("scaling", "md-scale-up-down", "slow", "network", "only-for-validation"), func() {
 	// MachineDeploymentScaleSpec implements a test that verifies that MachineDeployment scale operations are successful.
 	inputGetter := func() capi_e2e.MachineDeploymentScaleSpecInput {
 		return capi_e2e.MachineDeploymentScaleSpecInput{
diff --git a/test/e2e/mhc_remediations_test.go b/test/e2e/mhc_remediations_test.go
index 9bf2a0d14e..ce972f1012 100644
--- a/test/e2e/mhc_remediations_test.go
+++ b/test/e2e/mhc_remediations_test.go
@@ -24,7 +24,7 @@ import (
 	capi_e2e "sigs.k8s.io/cluster-api/test/e2e"
 )
 
-var _ = Describe("When testing unhealthy machines remediation", Label("machine-health-remediation", "slow", "network"), func() {
+var _ = Describe("When testing unhealthy machines remediation", Label("scaling", "machine-health-remediation", "slow", "network"), func() {
 	capi_e2e.MachineDeploymentRemediationSpec(ctx, func() capi_e2e.MachineDeploymentRemediationSpecInput {
 		return capi_e2e.MachineDeploymentRemediationSpecInput{
 			E2EConfig:             e2eConfig,