From 18756bca4a1faa6467711ed0175e9b647245a746 Mon Sep 17 00:00:00 2001
From: salonichf5 <146118978+salonichf5@users.noreply.github.com>
Date: Wed, 27 Nov 2024 13:47:39 -0800
Subject: [PATCH] update based on reviews

---
 .github/workflows/ci.yml | 2 +-
 tests/framework/ngf.go   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 59524fa9f3..1292261572 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -180,7 +180,7 @@ jobs:
           AZURE_STORAGE_KEY: ${{ secrets.AZURE_STORAGE_KEY }}
           AZURE_BUCKET_NAME: ${{ secrets.AZURE_BUCKET_NAME }}
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_COMMUNITY }}
-          TELEMETRY_ENDPOINT: ${{ github.ref_type == 'branch' && github.event_name == 'push' && github.ref == 'refs/heads/release' && 'oss-dev.edge.df.f5.com:443' || 'oss.edge.df.f5.com:443' }}
+          TELEMETRY_ENDPOINT: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release-') && 'oss-dev.edge.df.f5.com:443' || 'oss.edge.df.f5.com:443' }}
           TELEMETRY_ENDPOINT_INSECURE: "false"
 
       - name: Cache Artifacts
diff --git a/tests/framework/ngf.go b/tests/framework/ngf.go
index cd48a16aac..f19ea751b7 100644
--- a/tests/framework/ngf.go
+++ b/tests/framework/ngf.go
@@ -192,9 +192,10 @@ func UninstallNGF(cfg InstallationConfig, k8sClient client.Client) ([]byte, erro
 func setTelemetryArgs(cfg InstallationConfig) []string {
 	var args []string
 
-	args = append(args, formatValueSet("nginxGateway.productTelemetry.enable", "false")...)
 	if cfg.Telemetry {
 		args = append(args, formatValueSet("nginxGateway.productTelemetry.enable", "true")...)
+	} else {
+		args = append(args, formatValueSet("nginxGateway.productTelemetry.enable", "false")...)
 	}
 	return args
 }