Merge master

Author: sreejithsreekumaran

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

@@ -12,73 +12,52 @@ schedules:
     always: true
 
 stages:
-- stage: Pre_test
-  variables:
-  - group: GIT_SECRETS
-  jobs:
-  - job: validate_test_cases
-    displayName: "Validate Test Cases"
-    timeoutInMinutes: 20
-    continueOnError: false
-    pool: ubuntu-20.04
-    steps:
-    - template: ../pytest-collect-only.yml
 
 - stage: Test_round_1
-  dependsOn:
-  - Pre_test
-  condition: succeeded('Pre_test')
   variables:
   - group: SONiC-Elastictest
   - name: inventory
     value: veos_vtb
   - name: testbed_file
     value: vtestbed.yaml
-  - group: GIT_SECRETS
   jobs:
   - template: baseline.test.template.yml
 
 - stage: Test_round_2
   dependsOn:
-  - Pre_test
   - Test_round_1
-  condition: and(succeeded('Pre_test'), succeededOrFailed('Test_round_1'))
+  condition: succeededOrFailed('Test_round_1')
   variables:
   - group: SONiC-Elastictest
   - name: inventory
     value: veos_vtb
   - name: testbed_file
     value: vtestbed.yaml
-  - group: GIT_SECRETS
   jobs:
   - template: baseline.test.template.yml
 
 - stage: Test_round_3
   dependsOn:
-  - Pre_test
   - Test_round_2
-  condition: and(succeeded('Pre_test'), succeededOrFailed('Test_round_2'))
+  condition: succeededOrFailed('Test_round_2')
   variables:
   - group: SONiC-Elastictest
   - name: inventory
     value: veos_vtb
   - name: testbed_file
     value: vtestbed.yaml
-  - group: GIT_SECRETS
   jobs:
   - template: baseline.test.template.yml
 
 - stage: Test_round_4
   dependsOn:
-  - Pre_test
   - Test_round_3
-  condition: and(succeeded('Pre_test'), succeededOrFailed('Test_round_3'))
+  condition: succeededOrFailed('Test_round_3')
   variables:
   - group: SONiC-Elastictest
   - name: inventory
     value: veos_vtb
   - name: testbed_file
     value: vtestbed.yaml
-  - group: GIT_SECRETS
   jobs:
   - template: baseline.test.template.yml

.azure-pipelines/pr_test_scripts.yaml

@@ -269,6 +269,9 @@ dpu:
 
 onboarding_t0:
   - console/test_console_availability.py
+  - platform_tests/test_power_off_reboot.py
+  - platform_tests/test_sequential_restart.py
+  - platform_tests/test_xcvr_info_in_db.py
 
 
 specific_param:

.azure-pipelines/run-test-elastictest-template.yml

@@ -159,7 +159,11 @@ steps:
 
           # Else, internal build image repo, download from internal sonic-mgmt repo
           else
-            curl -u $(AZP_REPO_ACCESS_TOKEN) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml
+            if [ -z "$(MSSONIC-TOKEN)" ]; then
+              curl -u $(AZP_REPO_ACCESS_TOKEN) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml
+            else
+              curl -u :$(MSSONIC-TOKEN) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml
+            fi
           fi
         displayName: "Download pr script"
   - ${{ else }}:
@@ -227,11 +231,12 @@ steps:
     displayName: "Trigger test"
 
   - script: |
-      set -e
+      set -o
       echo "Lock testbed"
 
       echo -e "\033[33mSONiC PR system-level test is powered by SONiC Elastictest, for any issue, please send email to sonicelastictest@microsoft.com \033[0m"
       IFS=',' read -ra TEST_PLAN_ID_LIST <<< "$TEST_PLAN_ID_LIST_STRING"
+      failure_count=0
       for TEST_PLAN_ID in "${TEST_PLAN_ID_LIST[@]}"
       do
           echo -e -n "\033[33mPlease visit Elastictest page \033[0m"
@@ -240,17 +245,27 @@ steps:
           # When "LOCK_TESTBED" finish, it changes into "PREPARE_TESTBED"
           echo "[test_plan.py] poll LOCK_TESTBED status"
           python ./.azure-pipelines/test_plan.py poll -i $TEST_PLAN_ID --expected-state LOCK_TESTBED
+          RET=$?
+          if [ $RET -ne 0 ]; then
+              ((failure_count++))
+          fi
       done
 
+      if [ $failure_count -eq ${#TEST_PLAN_ID_LIST[@]} ]; then
+          echo "All testplan failed, cancel following steps"
+          exit 3
+      fi
+
     displayName: "Lock testbed"
 
   - script: |
-      set -e
+      set -o
       echo "Prepare testbed"
       echo "Preparing the testbed(add-topo, deploy-mg) may take 15-30 minutes. Before the testbed is ready, the progress of the test plan keeps displayed as 0, please be patient"
 
       echo -e "\033[33mSONiC PR system-level test is powered by SONiC Elastictest, for any issue, please send email to sonicelastictest@microsoft.com \033[0m"
       IFS=',' read -ra TEST_PLAN_ID_LIST <<< "$TEST_PLAN_ID_LIST_STRING"
+      failure_count=0
       for TEST_PLAN_ID in "${TEST_PLAN_ID_LIST[@]}"
       do
           echo -e -n "\033[33mPlease visit Elastictest page \033[0m"
@@ -259,16 +274,26 @@ steps:
           # When "PREPARE_TESTBED" finish, it changes into "EXECUTING"
           echo "[test_plan.py] poll PREPARE_TESTBED status"
           python ./.azure-pipelines/test_plan.py poll -i $TEST_PLAN_ID --expected-state PREPARE_TESTBED
+          RET=$?
+          if [ $RET -ne 0 ]; then
+              ((failure_count++))
+          fi
       done
 
+      if [ "$failure_count" -eq ${#TEST_PLAN_ID_LIST[@]} ]; then
+          echo "All testplan failed, cancel following steps"
+          exit 3
+      fi
+
     displayName: "Prepare testbed"
 
   - script: |
-      set -e
+      set -o
       echo "Run test"
 
       echo -e "\033[33mSONiC PR system-level test is powered by SONiC Elastictest, for any issue, please send email to sonicelastictest@microsoft.com \033[0m"
       IFS=',' read -ra TEST_PLAN_ID_LIST <<< "$TEST_PLAN_ID_LIST_STRING"
+      failure_count=0
       for TEST_PLAN_ID in "${TEST_PLAN_ID_LIST[@]}"
       do
           echo -e -n "\033[33mPlease visit Elastictest page \033[0m"
@@ -277,8 +302,17 @@ steps:
           # When "EXECUTING" finish, it changes into "KVMDUMP", "FAILED", "CANCELLED" or "FINISHED"
           echo "[test_plan.py] poll EXECUTING status"
           python ./.azure-pipelines/test_plan.py poll -i $TEST_PLAN_ID --expected-state EXECUTING --expected-result ${{ parameters.EXPECTED_RESULT }}
+          RET=$?
+          if [ $RET -ne 0 ]; then
+              ((failure_count++))
+          fi
       done
 
+      if [ $failure_count -eq ${#TEST_PLAN_ID_LIST[@]} ]; then
+          echo "All testplan failed, cancel following steps"
+          exit 3
+      fi
+
     displayName: "Run test"
     timeoutInMinutes: ${{ parameters.MAX_RUN_TEST_MINUTES }}