fix merge conflict

mssonicbld · Dec 10, 2022 · 1500c2d · 1500c2d
1 parent f753a8b
commit 1500c2d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml
@@ -16,7 +16,7 @@ parameters:
 
 - name: MAX_WORKER
   type: string
-  default: 2
+  default: 1
 
 - name: TEST_SET
   type: string

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -199,8 +199,8 @@ stages:
       parameters:
         TOPOLOGY: t0
         TEST_SET: t0-2vlans
-        MAX_WORKER: $(T0_2VLANS_INSTANCE_NUM)
         MIN_WORKER: $(T0_2VLANS_INSTANCE_NUM)
+        MAX_WORKER: $(T0_2VLANS_INSTANCE_NUM)
         DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"
 
   - job:
@@ -377,6 +377,6 @@ stages:
       - template: .azure-pipelines/run-test-scheduler-template.yml
         parameters:
           TOPOLOGY: wan-pub
-          MIN_WORKER: 1
-          MAX_WORKER: 1
+          MIN_WORKER: $(WAN_INSTANCE_NUM)
+          MAX_WORKER: $(WAN_INSTANCE_NUM)
           COMMON_EXTRA_PARAMS: "--skip_sanity "