From 13e86af284aaaaaf5fbb5a2acc63f8c2ad3c084c Mon Sep 17 00:00:00 2001 From: yutongzhang-microsoft Date: Wed, 30 Nov 2022 15:58:10 +0800 Subject: [PATCH] Support passing the instance numbers of a testplan. --- .azure-pipelines/run-test-scheduler-template.yml | 4 ++-- azure-pipelines.yml | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml index 5af2f8696e8b..8e26c16a0e46 100644 --- a/.azure-pipelines/run-test-scheduler-template.yml +++ b/.azure-pipelines/run-test-scheduler-template.yml @@ -11,11 +11,11 @@ parameters: default: 36000 - name: MIN_WORKER - type: number + type: string default: 1 - name: MAX_WORKER - type: number + type: string default: 2 - name: TEST_SET diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4fcdcb392602..e0445ceaeadb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -173,8 +173,8 @@ stages: - template: .azure-pipelines/run-test-scheduler-template.yml parameters: TOPOLOGY: t0 - MIN_WORKER: 2 - MAX_WORKER: 3 + MIN_WORKER: $(T0_INSTANCE_NUM) + MAX_WORKER: $(T0_INSTANCE_NUM) MGMT_BRANCH: 202012 - job: t0_2vlans_testbedv2 @@ -189,7 +189,8 @@ stages: parameters: TOPOLOGY: t0 TEST_SET: t0-2vlans - MAX_WORKER: 1 + MIN_WORKER: $(T0_2VLANS_INSTANCE_NUM) + MAX_WORKER: $(T0_2VLANS_INSTANCE_NUM) DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a" MGMT_BRANCH: 202012 @@ -250,8 +251,8 @@ stages: - template: .azure-pipelines/run-test-scheduler-template.yml parameters: TOPOLOGY: t1-lag - MIN_WORKER: 2 - MAX_WORKER: 3 + MIN_WORKER: $(T1_LAG_INSTANCE_NUM) + MAX_WORKER: $(T1_LAG_INSTANCE_NUM) MGMT_BRANCH: 202012 - job: @@ -292,7 +293,7 @@ stages: - template: .azure-pipelines/run-test-scheduler-template.yml parameters: TOPOLOGY: dualtor - MIN_WORKER: 1 - MAX_WORKER: 1 + MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM) + MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM) COMMON_EXTRA_PARAMS: "--disable_loganalyzer " MGMT_BRANCH: 202012