From 1500c2d41c514dbb3991371c34e987ef71be1af0 Mon Sep 17 00:00:00 2001
From: Yutong Zhang <90831468+yutongzhang-microsoft@users.noreply.github.com>
Date: Wed, 30 Nov 2022 22:36:55 +0800
Subject: [PATCH] fix merge conflict

---
 .azure-pipelines/run-test-scheduler-template.yml | 2 +-
 azure-pipelines.yml                              | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml
index 8b1395adff29..fc6b2d122052 100644
--- 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
index 75390210ffaf..ff62e1af43f4 100644
--- 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 "