fix merge conflict

This commit is contained in:
Yutong Zhang 2022-11-30 22:36:55 +08:00 committed by StormLiangMS
parent f753a8ba04
commit 1500c2d41c
2 changed files with 4 additions and 4 deletions

View File

@ -16,7 +16,7 @@ parameters:
- name: MAX_WORKER
type: string
default: 2
default: 1
- name: TEST_SET
type: string

View File

@ -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 "