From 657d856749e1843995bfbb740a304d64ed2286d4 Mon Sep 17 00:00:00 2001 From: longwan Date: Mon, 3 Feb 2025 20:00:15 +0000 Subject: [PATCH 1/5] 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 Date: Tue, 4 Feb 2025 23:04:23 +0000 Subject: [PATCH 2/5] 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 Date: Tue, 4 Feb 2025 23:08:54 +0000 Subject: [PATCH 3/5] 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 Date: Tue, 4 Feb 2025 23:09:33 +0000 Subject: [PATCH 4/5] 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 From 2f4dff9a8cec556b983ca6a5b96b290304573883 Mon Sep 17 00:00:00 2001 From: longwan Date: Wed, 5 Feb 2025 19:21:49 +0000 Subject: [PATCH 5/5] fix conformance test --- test/e2e/src/core/e2e_tests.sh | 18 +++++++++--------- test/e2e/src/tests/test_e2e_workflows.py | 3 ++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/test/e2e/src/core/e2e_tests.sh b/test/e2e/src/core/e2e_tests.sh index 3c421249b..59d9f39e2 100644 --- a/test/e2e/src/core/e2e_tests.sh +++ b/test/e2e/src/core/e2e_tests.sh @@ -52,24 +52,24 @@ waitForArcK8sClusterCreated() { } waitForCIExtensionInstalled() { - installedState=false + provisioningState=false max_retries=60 sleep_seconds=10 for i in $(seq 1 $max_retries) do echo "iteration: ${i}, clustername: ${CLUSTER_NAME}, resourcegroup: ${RESOURCE_GROUP}" - installState=$(az k8s-extension show --cluster-name $CLUSTER_NAME --resource-group $RESOURCE_GROUP --cluster-type connectedClusters --name azuremonitor-containers --query installState -o json) - installState=$(echo $installState | tr -d '"' | tr -d '"\r\n') - echo "extension install state: ${installState}" - if [ ! -z "$installState" ]; then - if [ "${installState}" == "Installed" ]; then - installedState=true + provisioningState=$(az k8s-extension show --cluster-name $CLUSTER_NAME --resource-group $RESOURCE_GROUP --cluster-type connectedClusters --name azuremonitor-containers --query provisioningState -o json) + provisioningState=$(echo $provisioningState | tr -d '"' | tr -d '"\r\n') + echo "extension install state: ${provisioningState}" + if [ ! -z "$provisioningState" ]; then + if [ "${provisioningState}" == "Installed" ]; then + provisioningState=true break fi - fi + fiKUBE_EVENTS_QUERY sleep ${sleep_seconds} done - echo "container insights extension installedState: $installedState" + echo "container insights extension provisioningState: $provisioningState" } validateCommonParameters() { diff --git a/test/e2e/src/tests/test_e2e_workflows.py b/test/e2e/src/tests/test_e2e_workflows.py index 6daddf4ce..35627e77b 100755 --- a/test/e2e/src/tests/test_e2e_workflows.py +++ b/test/e2e/src/tests/test_e2e_workflows.py @@ -120,6 +120,7 @@ def test_e2e_workflows(env_dict): pytest.fail("rowCount should be greater than for cluster: {0} for workflow: {1} ".format(clusterResourceId, 'KUBE_SERVICES')) # KubeEvents + # only the kube events with !normal event type will be collected query = constants.KUBE_EVENTS_QUERY.format(queryTimeInterval) params = { 'query': query} result = requests.get(queryUrl, params=params, headers=Headers) @@ -128,7 +129,7 @@ def test_e2e_workflows(env_dict): rowCount = result.json()['tables'][0]['rows'][0][0] if not rowCount: - pytest.fail("rowCount should be greater than for cluster: {0} for workflow: {1} ".format(clusterResourceId, 'KUBE_EVENTS')) + print("rowCount should be greater or equal than for cluster: {0} for workflow: {1} ".format(clusterResourceId, 'KUBE_EVENTS')) # Container Node Inventory query = constants.CONTAINER_NODE_INVENTORY_QUERY.format(queryTimeInterval)