From 4449d473ae6f3c5412d3101079e54c98d05670a1 Mon Sep 17 00:00:00 2001 From: Ye Jianquan Date: Tue, 27 Jun 2023 11:01:41 +0800 Subject: [PATCH] [CI/CD] Refine t0 sonic and remove SPECIFIED_PARAMS (#15625) Why I did it t0-sonic's specific params has been set on sonic-mgmt repo, remove useless SPECIFIED_PARAMS usage --- .azure-pipelines/run-test-scheduler-template.yml | 6 +----- azure-pipelines.yml | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml index 47a28429bc..176866a8bc 100644 --- a/.azure-pipelines/run-test-scheduler-template.yml +++ b/.azure-pipelines/run-test-scheduler-template.yml @@ -34,10 +34,6 @@ parameters: type: string default: "ceos" -- name: SPECIFIED_PARAMS - type: string - default: "{}" - - name: MGMT_BRANCH type: string default: master @@ -61,7 +57,7 @@ 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 }} \ --num-asic ${{ parameters.NUM_ASIC }} TEST_PLAN_ID=`cat new_test_plan_id.txt` diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f64c710cbe..c4f6e55dad 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -224,9 +224,8 @@ stages: MIN_WORKER: $(T0_SONIC_INSTANCE_NUM) MAX_WORKER: $(T0_SONIC_INSTANCE_NUM) TEST_SET: t0-sonic - COMMON_EXTRA_PARAMS: "--neighbor_type=sonic --enable_macsec --macsec_profile=128_SCI,256_XPN_SCI" + COMMON_EXTRA_PARAMS: "--neighbor_type=sonic " VM_TYPE: vsonic - SPECIFIED_PARAMS: '{\"test_pretest.py\":[\"--completeness_level=confident\",\"--allow_recover\"],\"test_posttest.py\":[\"--completeness_level=confident\",\"--allow_recover\"]}' - job: wan_elastictest displayName: "kvmtest-wan by Elastictest"