[CI/CD] Add topo and device_type args for PR test scripts (#12731)

What is the motivation for this PR?
Add "--topology" and "--device_type" arguments to PR test scripts. Fix the issue of "--device_type" skipped on test scripts without "device_type" mark.

How did you do it?
Add "--topology" and "--device_type" arguments to PR test scripts. Fix the issue of "--device_type" skipped on test scripts without "device_type" mark.

How did you verify/test it?
Raised Draft PR to test the template script:
https://github.com/sonic-net/sonic-mgmt/pull/12645/files

Signed-off-by: chunangli <[email protected]>

Author: lerry-lee

.azure-pipelines/test_plan.py

@@ -190,7 +190,7 @@ def get_token(self):
             "scope": get_scope(self.url)
         }
         attempt = 0
-        while(attempt < MAX_GET_TOKEN_RETRY_TIMES):
+        while (attempt < MAX_GET_TOKEN_RETRY_TIMES):
             try:
                 resp = requests.post(token_url, headers=headers, data=payload, timeout=10).json()
                 self._token = resp["access_token"]
@@ -223,6 +223,21 @@ def create(self, topology, test_plan_name="my_test_plan", deploy_mg_extra_params
 
         common_extra_params = common_extra_params + " --completeness_level=confident --allow_recover"
 
+        # Add topo and device type args for PR test
+        if test_plan_type == "PR":
+            # Add topo arg
+            if topology in ["t0", "t0-64-32"]:
+                common_extra_params = common_extra_params + " --topology=t0,any"
+            elif topology in ["t1-lag", "t1-8-lag"]:
+                common_extra_params = common_extra_params + " --topology=t1,any"
+            elif topology == "dualtor":
+                common_extra_params = common_extra_params + " --topology=t0,dualtor,any"
+            elif topology == "dpu":
+                common_extra_params = common_extra_params + " --topology=dpu,any"
+
+            # Add device type arg
+            common_extra_params = common_extra_params + " --device_type=vs"
+
         # If triggered by the internal repos, use internal sonic-mgmt repo as the code base
         sonic_mgmt_repo_url = GITHUB_SONIC_MGMT_REPO
         if kwargs.get("source_repo") in INTERNAL_REPO_LIST:

tests/common/plugins/custom_markers/__init__.py

@@ -42,8 +42,8 @@ def pytest_configure(config):
         allowed values: 'physical', 'vs'"
     )
     config.addinivalue_line(
-        "markers", "supported_completeness_level(TEST_LEVEL): mark test to specify the completeness level for the test. \
-        Allowed values: 'debug', 'basic' ,'confident', 'thorough'"
+        "markers", "supported_completeness_level(TEST_LEVEL): mark test to specify the completeness level for the \
+        test. Allowed values: 'debug', 'basic' ,'confident', 'thorough'"
     )
 
 
@@ -122,8 +122,7 @@ def check_device_type(item):
     if dev:
         if item.config.getoption("--device_type") not in dev:
             pytest.skip("test requires device type in {!r}".format(dev))
-    else:
-        pytest.skip("test does not match device type")
+    # Else, test case not specify device_type explicitly, by default run on all devices
 
 
 def check_test_completeness(item):