updating the testplan to include the new test case and metrics measur…

.azure-pipelines/baseline_test/baseline.test.mgmt.public.yml

@@ -46,10 +46,11 @@ stages:
   jobs:
   - template: ../pr_test_template.yml
     parameters:
-      BUILD_REASON: ${{ parameters.BUILD_REASON }}
-      TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
-      RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
-      TEST_PLAN_STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
+      GLOBAL_PARAMS:
+        BUILD_REASON: ${{ parameters.BUILD_REASON }}
+        RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
+        STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
+        TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
 
 - stage: Test_round_2
   dependsOn:
@@ -58,10 +59,11 @@ stages:
   jobs:
   - template: ../pr_test_template.yml
     parameters:
-      BUILD_REASON: ${{ parameters.BUILD_REASON }}
-      TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
-      RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
-      TEST_PLAN_STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
+      GLOBAL_PARAMS:
+        BUILD_REASON: ${{ parameters.BUILD_REASON }}
+        RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
+        STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
+        TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
 
 - stage: Test_round_3
   dependsOn:
@@ -70,10 +72,11 @@ stages:
   jobs:
   - template: ../pr_test_template.yml
     parameters:
-      BUILD_REASON: ${{ parameters.BUILD_REASON }}
-      TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
-      RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
-      TEST_PLAN_STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
+      GLOBAL_PARAMS:
+        BUILD_REASON: ${{ parameters.BUILD_REASON }}
+        RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
+        STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
+        TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
 
 - stage: Test_round_4
   dependsOn:
@@ -82,7 +85,8 @@ stages:
   jobs:
   - template: ../pr_test_template.yml
     parameters:
-      BUILD_REASON: ${{ parameters.BUILD_REASON }}
-      TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
-      RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
-      TEST_PLAN_STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
+      GLOBAL_PARAMS:
+        BUILD_REASON: ${{ parameters.BUILD_REASON }}
+        RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
+        STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
+        TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}

.azure-pipelines/impacted_area_testing/calculate-instance-numbers.yml

@@ -14,7 +14,8 @@ steps:
 - script: |
     set -x
 
-    sudo apt-get -o DPkg::Lock::Timeout=600 update && sudo apt-get -o DPkg::Lock::Timeout=600 -y install jq
+    sudo apt-get -o DPkg::Lock::Timeout=600 update || true
+    sudo apt-get -o DPkg::Lock::Timeout=600 -y install jq
 
     echo "$TEST_SCRIPTS" > /tmp/ts.json
     echo "TEST_SCRIPTS value from file:"

.azure-pipelines/impacted_area_testing/get-impacted-area.yml

@@ -102,17 +102,53 @@ steps:
       fi
     done
 
-    TEST_SCRIPTS=$(python ./.azure-pipelines/impacted_area_testing/get_test_scripts.py --features ${FINAL_FEATURES} --location tests)
+    # Generate TEST_SCRIPTS with retry logic for JSON validation
+    MAX_RETRIES=3
+    RETRY_COUNT=0
 
-    if [[ $? -ne 0 ]]; then
-      echo "##vso[task.complete result=Failed;]Get test scripts fails."
-      exit 1
-    fi
+    while [ $RETRY_COUNT -lt $MAX_RETRIES ]; do
+      echo "Attempt $((RETRY_COUNT + 1)): Generating test scripts..."
 
-    PR_CHECKERS=$(echo "${TEST_SCRIPTS}" | jq -c 'keys')
+      TEST_SCRIPTS=$(python ./.azure-pipelines/impacted_area_testing/get_test_scripts.py --features ${FINAL_FEATURES} --location tests)
 
-    if [[ $? -ne 0 ]]; then
-      echo "##vso[task.complete result=Failed;]Get valid PR checkers fails."
+      if [[ $? -ne 0 ]]; then
+        echo "Get test scripts command failed on attempt $((RETRY_COUNT + 1))"
+        RETRY_COUNT=$((RETRY_COUNT + 1))
+        if [ $RETRY_COUNT -lt $MAX_RETRIES ]; then
+          echo "Retrying in 2 seconds..."
+          sleep 2
+        fi
+        continue
+      fi
+
+      # Validate TEST_SCRIPTS is valid JSON
+      if echo "$TEST_SCRIPTS" | jq empty > /dev/null 2>&1; then
+        echo "TEST_SCRIPTS is valid JSON: $TEST_SCRIPTS"
+
+        # Generate PR_CHECKERS
+        PR_CHECKERS=$(echo "${TEST_SCRIPTS}" | jq -c 'keys')
+
+        if [[ $? -eq 0 ]] && echo "$PR_CHECKERS" | jq empty > /dev/null 2>&1; then
+          echo "PR_CHECKERS is valid list: $PR_CHECKERS"
+          echo "All validations passed successfully"
+          break
+        else
+          echo "PR_CHECKERS generation failed or invalid list: $PR_CHECKERS"
+        fi
+      else
+        echo "TEST_SCRIPTS is not valid JSON: $TEST_SCRIPTS"
+      fi
+
+      RETRY_COUNT=$((RETRY_COUNT + 1))
+      if [ $RETRY_COUNT -lt $MAX_RETRIES ]; then
+        echo "Retrying in 2 seconds..."
+        sleep 2
+      fi
+    done
+
+    # Final validation
+    if [ $RETRY_COUNT -eq $MAX_RETRIES ]; then
+      echo "##vso[task.complete result=Failed;]Failed to generate valid JSON after $MAX_RETRIES attempts. Last TEST_SCRIPTS: $TEST_SCRIPTS"
       exit 1
     fi
 

.azure-pipelines/pr_test_scripts.yaml

@@ -710,6 +710,8 @@ t1-lag-vpp:
   - route/test_route_flap.py
   - route/test_route_perf.py
   - route/test_route_bgp_ecmp.py
+  - srv6/test_srv6_dataplane.py
+  - srv6/test_srv6_static_config.py
   - vxlan/test_vxlan_ecmp.py
   - vxlan/test_vxlan_decap.py
   - vxlan/test_vnet_decap.py