From 657d856749e1843995bfbb740a304d64ed2286d4 Mon Sep 17 00:00:00 2001
From: longwan <longwan@microsoft.com>
Date: Mon, 3 Feb 2025 20:00:15 +0000
Subject: [PATCH 1/4] fix conformance test version conflict with
 AutoUpgradeMinorVersion

---
 test/e2e/src/core/e2e_tests.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test/e2e/src/core/e2e_tests.sh b/test/e2e/src/core/e2e_tests.sh
index 1554db194..3d2e3f598 100644
--- a/test/e2e/src/core/e2e_tests.sh
+++ b/test/e2e/src/core/e2e_tests.sh
@@ -131,9 +131,6 @@ createArcCIExtension() {
     if [ ! -z "$CI_ARC_RELEASE_TRAIN" ]; then
        basicparameters="$basicparameters  --release-train $CI_ARC_RELEASE_TRAIN"
     fi
-    if [ ! -z "$CI_ARC_VERSION" ]; then
-       basicparameters="$basicparameters  --version $CI_ARC_VERSION"
-    fi
 
    if [ ! -z "$USE_AAD_AUTH" ]; then
      az k8s-extension create $basicparameters --configuration-settings amalogs.ISTEST=true amalogs.useAADAuth=$USE_AAD_AUTH

From bc6c06cab55087a1b253b9da5996f3ba5cfa51c2 Mon Sep 17 00:00:00 2001
From: longwan <longwan@microsoft.com>
Date: Tue, 4 Feb 2025 23:04:23 +0000
Subject: [PATCH 2/4] set auto upgrade minor version false

---
 test/e2e/src/core/e2e_tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/e2e/src/core/e2e_tests.sh b/test/e2e/src/core/e2e_tests.sh
index 3d2e3f598..93966a651 100644
--- a/test/e2e/src/core/e2e_tests.sh
+++ b/test/e2e/src/core/e2e_tests.sh
@@ -127,11 +127,15 @@ addArcK8sCLIExtension() {
 
 createArcCIExtension() {
 	echo "creating extension type: Microsoft.AzureMonitor.Containers"
-    basicparameters="--cluster-name $CLUSTER_NAME --resource-group $RESOURCE_GROUP --cluster-type connectedClusters --extension-type Microsoft.AzureMonitor.Containers --scope cluster --name azuremonitor-containers"
+    basicparameters="--cluster-name $CLUSTER_NAME --resource-group $RESOURCE_GROUP --cluster-type connectedClusters --extension-type Microsoft.AzureMonitor.Containers --scope cluster --name azuremonitor-containers --auto-upgrade-minor-version false"
     if [ ! -z "$CI_ARC_RELEASE_TRAIN" ]; then
        basicparameters="$basicparameters  --release-train $CI_ARC_RELEASE_TRAIN"
     fi
 
+    if [ ! -z "$CI_ARC_VERSION" ]; then
+       basicparameters="$basicparameters --version $CI_ARC_VERSION"
+    fi
+
    if [ ! -z "$USE_AAD_AUTH" ]; then
      az k8s-extension create $basicparameters --configuration-settings amalogs.ISTEST=true amalogs.useAADAuth=$USE_AAD_AUTH
    else

From 68ee39a4e4774991b4754f2692f74c3c7d047e4e Mon Sep 17 00:00:00 2001
From: longwan <longwan@microsoft.com>
Date: Tue, 4 Feb 2025 23:08:54 +0000
Subject: [PATCH 3/4] remove empty space

---
 test/e2e/src/core/e2e_tests.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/e2e/src/core/e2e_tests.sh b/test/e2e/src/core/e2e_tests.sh
index 93966a651..9a310bf9f 100644
--- a/test/e2e/src/core/e2e_tests.sh
+++ b/test/e2e/src/core/e2e_tests.sh
@@ -131,7 +131,6 @@ createArcCIExtension() {
     if [ ! -z "$CI_ARC_RELEASE_TRAIN" ]; then
        basicparameters="$basicparameters  --release-train $CI_ARC_RELEASE_TRAIN"
     fi
-
     if [ ! -z "$CI_ARC_VERSION" ]; then
        basicparameters="$basicparameters --version $CI_ARC_VERSION"
     fi

From a90a8479daa07e9ca2ade489b890847cc96c6ceb Mon Sep 17 00:00:00 2001
From: longwan <longwan@microsoft.com>
Date: Tue, 4 Feb 2025 23:09:33 +0000
Subject: [PATCH 4/4] remove empty space

---
 test/e2e/src/core/e2e_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e/src/core/e2e_tests.sh b/test/e2e/src/core/e2e_tests.sh
index 9a310bf9f..3c421249b 100644
--- a/test/e2e/src/core/e2e_tests.sh
+++ b/test/e2e/src/core/e2e_tests.sh
@@ -132,7 +132,7 @@ createArcCIExtension() {
        basicparameters="$basicparameters  --release-train $CI_ARC_RELEASE_TRAIN"
     fi
     if [ ! -z "$CI_ARC_VERSION" ]; then
-       basicparameters="$basicparameters --version $CI_ARC_VERSION"
+       basicparameters="$basicparameters  --version $CI_ARC_VERSION"
     fi
 
    if [ ! -z "$USE_AAD_AUTH" ]; then