Longw/fix conformance test (#1350)

* fix conformance test version conflict with AutoUpgradeMinorVersion

Author: wanlonghenry

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}" == "Succeeded" ]; then
+            provisioningState=true
             break
          fi
       fi
       sleep ${sleep_seconds}
     done
-    echo "container insights extension installedState: $installedState"
+    echo "container insights extension provisioningState: $provisioningState"
 }
 
 validateCommonParameters() {

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)