diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml index 470558637b..f43ce59d8a 100644 --- a/.azure-pipelines/run-test-scheduler-template.yml +++ b/.azure-pipelines/run-test-scheduler-template.yml @@ -42,6 +42,10 @@ parameters: type: string default: master +- name: NUM_ASIC + type: number + default: 1 + steps: - script: | set -ex @@ -57,7 +61,8 @@ steps: --min-worker ${{ parameters.MIN_WORKER }} --max-worker ${{ parameters.MAX_WORKER }} \ --test-set ${{ parameters.TEST_SET }} --kvm-build-id $(KVM_BUILD_ID) \ --deploy-mg-extra-params "${{ parameters.DEPLOY_MG_EXTRA_PARAMS }}" --common-extra-params "${{ parameters.COMMON_EXTRA_PARAMS }}" \ - --mgmt-branch ${{ parameters.MGMT_BRANCH }} --vm-type ${{ parameters.VM_TYPE }} --specified-params "${{ parameters.SPECIFIED_PARAMS }}" + --mgmt-branch ${{ parameters.MGMT_BRANCH }} --vm-type ${{ parameters.VM_TYPE }} --specified-params "${{ parameters.SPECIFIED_PARAMS }}" \ + --num-asic ${{ parameters.NUM_ASIC }} TEST_PLAN_ID=`cat new_test_plan_id.txt` echo "Created test plan $TEST_PLAN_ID" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f0127c3251..073702ba3f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -305,6 +305,7 @@ stages: pool: sonictest-ma displayName: "kvmtest-multi-asic-t1-lag" timeoutInMinutes: 240 + condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_CLASSICAL_TEST, 'YES')) continueOnError: true steps: - template: .azure-pipelines/run-test-template.yml @@ -315,6 +316,22 @@ stages: tbtype: multi-asic-t1-lag-pr image: sonic-4asic-vs.img.gz + - job: multi_asic_testbedv2 + displayName: "kvmtest-multi-asic-t1-lag by TestbedV2" + pool: + vmImage: 'ubuntu-20.04' + timeoutInMinutes: 1080 + condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES')) + continueOnError: true + steps: + - template: .azure-pipelines/run-test-scheduler-template.yml + parameters: + TOPOLOGY: t1-8-lag + TEST_SET: multi-asic-t1-lag + MIN_WORKER: 1 + MAX_WORKER: 1 + NUM_ASIC: 4 + - job: dualtor_testbedv2 pool: vmImage: 'ubuntu-20.04'