Merge remote-tracking branch 'origin/master' into master-gcu_t2_support_ecn_config

Author: okaravasi

…est/baseline.test.mgmt.public.master.yml …eline_test/baseline.test.mgmt.public.yml.azure-pipelines/baseline_test/baseline.test.mgmt.public.master.yml renamed to .azure-pipelines/baseline_test/baseline.test.mgmt.public.yml .azure-pipelines/baseline_test/baseline.test.mgmt.public.master.yml renamed to .azure-pipelines/baseline_test/baseline.test.mgmt.public.yml

@@ -1,214 +1,101 @@
 jobs:
   - job: get_impacted_area
+    cancelTimeoutInMinutes: 10
     displayName: "Get impacted area"
     timeoutInMinutes: 240
     continueOnError: false
     pool: sonic-ubuntu-1c
     steps:
       - template: ../impacted_area_testing/get-impacted-area.yml
 
-  - job: impacted_area_t0_elastictest
-    displayName: "impacted-area-kvmtest-t0 by Elastictest"
+  - job: impacted_area_kvmtest
+    displayName: " "
+    cancelTimeoutInMinutes: 10
     dependsOn: get_impacted_area
-    condition: contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], 't0_checker')
-    variables:
-      TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ]
-    timeoutInMinutes: 240
-    continueOnError: false
-    pool: sonic-ubuntu-1c
-    steps:
-      - template: ../impacted_area_testing/calculate-instance-numbers.yml
-        parameters:
+    strategy:
+      matrix:
+        impacted-area-kvmtest-t0:
+          TESTBED_PREP_TOPOLOGY: t0
+          CHECKER: t0_checker
           TOPOLOGY: t0
-          BUILD_BRANCH: "master"
-
-      - template: ../run-test-elastictest-template.yml
-        parameters:
-          TOPOLOGY: t0
-          SCRIPTS: $(SCRIPTS)
-          MIN_WORKER: $(INSTANCE_NUMBER)
-          MAX_WORKER: $(INSTANCE_NUMBER)
-          KVM_IMAGE_BRANCH: "master"
-          MGMT_BRANCH: "master"
-          BUILD_REASON: "BaselineTest"
-          RETRY_TIMES: "0"
-          STOP_ON_FAILURE: "False"
-          TEST_PLAN_NUM: $(BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM)
-
-  - job: impacted_area_t0_2vlans_elastictest
-    displayName: "impacted-area-kvmtest-t0_2vlans by Elastictest"
-    dependsOn: get_impacted_area
-    condition: contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], 't0-2vlans_checker')
-    variables:
-      TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ]
-    timeoutInMinutes: 240
-    continueOnError: false
-    pool: sonic-ubuntu-1c
-    steps:
-      - template: ../impacted_area_testing/calculate-instance-numbers.yml
-        parameters:
-          TOPOLOGY: t0-2vlans
-          BUILD_BRANCH: "master"
-
-      - template: ../run-test-elastictest-template.yml
-        parameters:
+          PREPARE_TIME: 30
+        impacted-area-kvmtest-t0-2vlans:
+          TESTBED_PREP_TOPOLOGY: t0-2vlans
+          CHECKER: t0-2vlans_checker
+          DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a "
           TOPOLOGY: t0
-          SCRIPTS: $(SCRIPTS)
-          MIN_WORKER: $(INSTANCE_NUMBER)
-          MAX_WORKER: $(INSTANCE_NUMBER)
-          DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"
-          KVM_IMAGE_BRANCH: "master"
-          MGMT_BRANCH: "master"
-          BUILD_REASON: "BaselineTest"
-          RETRY_TIMES: "0"
-          STOP_ON_FAILURE: "False"
-          TEST_PLAN_NUM: $(BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM)
-
-  - job: impacted_area_t1_lag_elastictest
-    displayName: "impacted-area-kvmtest-t1-lag by Elastictest"
-    dependsOn: get_impacted_area
-    condition: contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], 't1_checker')
-    variables:
-      TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ]
-    timeoutInMinutes: 240
-    continueOnError: false
-    pool: sonic-ubuntu-1c
-    steps:
-      - template: ../impacted_area_testing/calculate-instance-numbers.yml
-        parameters:
-          TOPOLOGY: t1
-          BUILD_BRANCH: "master"
+          PREPARE_TIME: 30
+        impacted-area-kvmtest-t1-lag:
+          TESTBED_PREP_TOPOLOGY: t1
+          CHECKER: t1_checker
+          TOPOLOGY: t1-lag
           # 50 mins for preparing testbed, 30 mins for pre-test and post-test
           PREPARE_TIME: 80
-
-      - template: ../run-test-elastictest-template.yml
-        parameters:
-          TOPOLOGY: t1-lag
-          SCRIPTS: $(SCRIPTS)
-          MIN_WORKER: $(INSTANCE_NUMBER)
-          MAX_WORKER: $(INSTANCE_NUMBER)
-          KVM_IMAGE_BRANCH: "master"
-          MGMT_BRANCH: "master"
-          BUILD_REASON: "BaselineTest"
-          RETRY_TIMES: "0"
-          STOP_ON_FAILURE: "False"
-          TEST_PLAN_NUM: $(BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM)
-
-  - job: impacted_area_dualtor_elastictest
-    displayName: "impacted-area-kvmtest-dualtor by Elastictest"
-    dependsOn: get_impacted_area
-    condition: contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], 'dualtor_checker')
-    variables:
-      TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ]
-    timeoutInMinutes: 240
-    continueOnError: false
-    pool: sonic-ubuntu-1c
-    steps:
-      - template: ../impacted_area_testing/calculate-instance-numbers.yml
-        parameters:
+        impacted-area-kvmtest-dualtor:
+          TESTBED_PREP_TOPOLOGY: dualtor
+          CHECKER: dualtor_checker
+          COMMON_EXTRA_PARAMS: "--disable_loganalyzer "
           TOPOLOGY: dualtor
-          BUILD_BRANCH: "master"
           # 30 mins for preparing testbed, 30 mins for pre-test and 20 mins for post-test
           PREPARE_TIME: 80
-
-      - template: ../run-test-elastictest-template.yml
-        parameters:
-          TOPOLOGY: dualtor
-          SCRIPTS: $(SCRIPTS)
-          MIN_WORKER: $(INSTANCE_NUMBER)
-          MAX_WORKER: $(INSTANCE_NUMBER)
-          COMMON_EXTRA_PARAMS: "--disable_loganalyzer "
-          KVM_IMAGE_BRANCH: "master"
-          MGMT_BRANCH: "master"
-          BUILD_REASON: "BaselineTest"
-          RETRY_TIMES: "0"
-          STOP_ON_FAILURE: "False"
-          TEST_PLAN_NUM: $(BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM)
-
-  - job: impacted_area_multi_asic_elastictest
-    displayName: "impacted-area-kvmtest-multi_asic by Elastictest"
-    dependsOn: get_impacted_area
-    condition: contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], 't1-multi-asic_checker')
-    variables:
-      TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ]
-    timeoutInMinutes: 240
-    continueOnError: false
-    pool: sonic-ubuntu-1c
-    steps:
-      - template: ../impacted_area_testing/calculate-instance-numbers.yml
-        parameters:
-          TOPOLOGY: t1-multi-asic
-          BUILD_BRANCH: "master"
-
-      - template: ../run-test-elastictest-template.yml
-        parameters:
+        impacted-area-kvmtest-multi-asic-t1:
+          TESTBED_PREP_TOPOLOGY: t1-multi-asic
+          CHECKER: t1-multi-asic_checker
           TOPOLOGY: t1-8-lag
-          SCRIPTS: $(SCRIPTS)
-          MIN_WORKER: $(INSTANCE_NUMBER)
-          MAX_WORKER: $(INSTANCE_NUMBER)
           NUM_ASIC: 4
-          KVM_IMAGE_BRANCH: "master"
-          MGMT_BRANCH: "master"
-          BUILD_REASON: "BaselineTest"
-          RETRY_TIMES: "0"
-          STOP_ON_FAILURE: "False"
-          TEST_PLAN_NUM: $(BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM)
-
-  - job: impacted_area_sonic_t0_elastictest
-    displayName: "impacted-area-kvmtest-sonic_t0 by Elastictest"
-    dependsOn: get_impacted_area
-    condition: contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], 't0-sonic_checker')
-    variables:
-      TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ]
-    timeoutInMinutes: 240
-    continueOnError: false
-    pool: sonic-ubuntu-1c
-    steps:
-      - template: ../impacted_area_testing/calculate-instance-numbers.yml
-        parameters:
-          TOPOLOGY: t0-sonic
-          BUILD_BRANCH: "master"
-          PREPARE_TIME: 40
-
-      - template: ../run-test-elastictest-template.yml
-        parameters:
-          TOPOLOGY: t0-64-32
-          SCRIPTS: $(SCRIPTS)
-          MIN_WORKER: $(INSTANCE_NUMBER)
-          MAX_WORKER: $(INSTANCE_NUMBER)
-          KVM_IMAGE_BRANCH: "master"
+          PREPARE_TIME: 30
+        impacted-area-kvmtest-t0-sonic:
+          TESTBED_PREP_TOPOLOGY: t0-sonic
+          CHECKER: t0-sonic_checker
           COMMON_EXTRA_PARAMS: "--neighbor_type=sonic "
+          TOPOLOGY: t0-64-32
+          PREPARE_TIME: 40
           VM_TYPE: vsonic
-          MGMT_BRANCH: "master"
-          BUILD_REASON: "BaselineTest"
-          RETRY_TIMES: "0"
-          STOP_ON_FAILURE: "False"
-          TEST_PLAN_NUM: $(BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM)
-
-  - job: impacted_area_dpu_elastictest
-    displayName: "impacted-area-kvmtest-dpu by Elastictest"
-    dependsOn: get_impacted_area
-    condition: contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], 'dpu_checker')
+          SPECIFIC_PARAM: '[
+            {"name": "bgp/test_bgp_fact.py", "param": "--neighbor_type=sonic --enable_macsec --macsec_profile=128_SCI,256_XPN_SCI"},
+            {"name": "macsec", "param": "--neighbor_type=sonic --enable_macsec --macsec_profile=128_SCI,256_XPN_SCI"}
+            ]'
+        impacted-area-kvmtest-dpu:
+          TESTBED_PREP_TOPOLOGY: dpu
+          CHECKER: dpu_checker
+          TOPOLOGY: dpu
+          PREPARE_TIME: 30
+          SPECIFIC_PARAM: '[
+            {"name": "dash/test_dash_vnet.py", "param": "--skip_dataplane_checking"}
+            ]'
+    condition: contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], variables['CHECKER'])
     variables:
       TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ]
-    timeoutInMinutes: 240
+      NUM_ASIC: 1
+      VM_TYPE: ceos
+      COMMON_EXTRA_PARAMS: ""
+      DEPLOY_MG_EXTRA_PARAMS: ""
+      SPECIFIC_PARAM: "[]"
+    timeoutInMinutes: 300
     continueOnError: false
     pool: sonic-ubuntu-1c
     steps:
       - template: ../impacted_area_testing/calculate-instance-numbers.yml
         parameters:
-          TOPOLOGY: dpu
-          BUILD_BRANCH: "master"
+          TOPOLOGY: $(TESTBED_PREP_TOPOLOGY)
+          BUILD_BRANCH: $(Build.SourceBranchName)
+          PREPARE_TIME: $(PREPARE_TIME)
 
       - template: ../run-test-elastictest-template.yml
         parameters:
-          TOPOLOGY: dpu
+          TOPOLOGY: $(TOPOLOGY)
           SCRIPTS: $(SCRIPTS)
           MIN_WORKER: $(INSTANCE_NUMBER)
           MAX_WORKER: $(INSTANCE_NUMBER)
-          KVM_IMAGE_BRANCH: "master"
-          MGMT_BRANCH: "master"
+          DEPLOY_MG_EXTRA_PARAMS: $(DEPLOY_MG_EXTRA_PARAMS)
+          COMMON_EXTRA_PARAMS: $(COMMON_EXTRA_PARAMS)
+          KVM_IMAGE_BRANCH: $(Build.SourceBranchName)
+          MGMT_BRANCH: $(Build.SourceBranchName)
           BUILD_REASON: "BaselineTest"
           RETRY_TIMES: "0"
           STOP_ON_FAILURE: "False"
           TEST_PLAN_NUM: $(BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM)
+          NUM_ASIC: $(NUM_ASIC)
+          VM_TYPE: $(VM_TYPE)
+          SPECIFIC_PARAM: $(SPECIFIC_PARAM)
+          MAX_RUN_TEST_MINUTES: 240