From d86aa20ef547cc84eb488439c54a249f75391384 Mon Sep 17 00:00:00 2001 From: Ye Jianquan Date: Fri, 2 Jun 2023 16:33:30 +0800 Subject: [PATCH] [CI/CD] Refine pr test definition, remove old test jobs and testbedv2 flags (#15302) --- .../run-test-scheduler-template.yml | 13 +- azure-pipelines.yml | 112 +++--------------- 2 files changed, 20 insertions(+), 105 deletions(-) diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml index b75885d660..47a28429bc 100644 --- a/.azure-pipelines/run-test-scheduler-template.yml +++ b/.azure-pipelines/run-test-scheduler-template.yml @@ -51,7 +51,7 @@ steps: set -e wget -O ./.azure-pipelines/test_plan.py https://raw.githubusercontent.com/sonic-net/sonic-mgmt/master/.azure-pipelines/test_plan.py wget -O ./.azure-pipelines/pr_test_scripts.yaml https://raw.githubusercontent.com/sonic-net/sonic-mgmt/master/.azure-pipelines/pr_test_scripts.yaml - displayName: Download TestbedV2 scripts + displayName: Download test plan scripts - script: | set -e @@ -78,7 +78,7 @@ steps: - script: | set -e echo "Lock testbed" - echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com" + echo "SONiC PR system-level test is powered by SONiC Elastictest, for any issue, please send email to sonicelastictest@microsoft.com" echo "Runtime detailed progress at $(FRONTEND_URL)/scheduler/testplan/$TEST_PLAN_ID " # When "LOCK_TESTBED" finish, it changes into "PREPARE_TESTBED" python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state LOCK_TESTBED @@ -89,9 +89,8 @@ steps: - script: | set -e echo "Prepare testbed" - echo "Preparing the testbed(add-topo, deploy-mg) may take 15-30 minutes. Before the testbed is ready, the progress of the test plan keeps displayed as 0, please be patient(We will improve the indication in a short time)" - echo "If the progress keeps as 0 for more than 1 hour, please cancel and retry this pipeline" - echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com" + echo "Preparing the testbed(add-topo, deploy-mg) may take 15-30 minutes. Before the testbed is ready, the progress of the test plan keeps displayed as 0, please be patient" + echo "SONiC PR system-level test is powered by SONiC Elastictest, for any issue, please send email to sonicelastictest@microsoft.com" echo "Runtime detailed progress at $(FRONTEND_URL)/scheduler/testplan/$TEST_PLAN_ID " # When "PREPARE_TESTBED" finish, it changes into "EXECUTING" python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state PREPARE_TESTBED @@ -102,7 +101,7 @@ steps: - script: | set -e echo "Run test" - echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com" + echo "SONiC PR system-level test is powered by SONiC Elastictest, for any issue, please send email to sonicelastictest@microsoft.com" echo "Runtime detailed progress at $(FRONTEND_URL)/scheduler/testplan/$TEST_PLAN_ID " # When "EXECUTING" finish, it changes into "KVMDUMP", "FAILED", "CANCELLED" or "FINISHED" python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state EXECUTING @@ -113,7 +112,7 @@ steps: - script: | set -e echo "KVM dump" - echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com" + echo "SONiC PR system-level test is powered by SONiC Elastictest, for any issue, please send email to sonicelastictest@microsoft.com" echo "Runtime detailed progress at $(FRONTEND_URL)/scheduler/testplan/$TEST_PLAN_ID " # When "KVMDUMP" finish, it changes into "FAILED", "CANCELLED" or "FINISHED" python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state KVMDUMP diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c1140b27dc..ae63035f9f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -143,43 +143,10 @@ stages: testResultsFiles: '**/tr.xml' testRunTitle: vstest - - job: t0_part1 - pool: sonictest - displayName: "kvmtest-t0-part1" - timeoutInMinutes: 400 - condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_CLASSICAL_TEST, 'YES')) - continueOnError: false - steps: - - template: .azure-pipelines/run-test-template.yml - parameters: - dut: vlab-01 - tbname: vms-kvm-t0 - ptf_name: ptf_vms6-1 - tbtype: t0 - vmtype: ceos - section: part-1 - - - job: t0_part2 - pool: sonictest - displayName: "kvmtest-t0-part2" - timeoutInMinutes: 400 - condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_CLASSICAL_TEST, 'YES')) - continueOnError: false - steps: - - template: .azure-pipelines/run-test-template.yml - parameters: - dut: vlab-01 - tbname: vms-kvm-t0 - ptf_name: ptf_vms6-1 - tbtype: t0 - vmtype: ceos - section: part-2 - - - job: t0_testbedv2 + - job: t0_elastictest pool: ubuntu-20.04 - displayName: "kvmtest-t0 by TestbedV2" + displayName: "kvmtest-t0 by Elastictest" timeoutInMinutes: 240 - condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES')) continueOnError: false steps: - template: .azure-pipelines/run-test-scheduler-template.yml @@ -188,11 +155,10 @@ stages: MIN_WORKER: $(T0_INSTANCE_NUM) MAX_WORKER: $(T0_INSTANCE_NUM) - - job: t0_2vlans_testbedv2 + - job: t0_2vlans_elastictest pool: ubuntu-20.04 - displayName: "kvmtest-t0-2vlans by TestbedV2" + displayName: "kvmtest-t0-2vlans by Elastictest" timeoutInMinutes: 240 - condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES')) continueOnError: false steps: - template: .azure-pipelines/run-test-scheduler-template.yml @@ -203,26 +169,10 @@ stages: MAX_WORKER: $(T0_2VLANS_INSTANCE_NUM) DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a" - - job: t1_lag_classic - pool: sonictest-t1-lag - displayName: "kvmtest-t1-lag classic" - timeoutInMinutes: 400 - condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_CLASSICAL_TEST, 'YES')) - continueOnError: false - steps: - - template: .azure-pipelines/run-test-template.yml - parameters: - dut: vlab-03 - tbname: vms-kvm-t1-lag - ptf_name: ptf_vms6-2 - tbtype: t1-lag - vmtype: ceos - - - job: t1_lag_testbedv2 + - job: t1_lag_elastictest pool: ubuntu-20.04 - displayName: "kvmtest-t1-lag by TestbedV2" + displayName: "kvmtest-t1-lag by Elastictest" timeoutInMinutes: 240 - condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES')) continueOnError: false steps: - template: .azure-pipelines/run-test-scheduler-template.yml @@ -231,41 +181,10 @@ stages: MIN_WORKER: $(T1_LAG_INSTANCE_NUM) MAX_WORKER: $(T1_LAG_INSTANCE_NUM) - - job: - pool: sonictest-sonic-t0 - displayName: "kvmtest-t0-sonic" - timeoutInMinutes: 360 - condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_CLASSICAL_TEST, 'YES')) - continueOnError: false - steps: - - template: .azure-pipelines/run-test-template.yml - parameters: - dut: vlab-02 - tbname: vms-kvm-t0-64-32 - ptf_name: ptf_vms6-1 - tbtype: t0-sonic - vmtype: vsonic - - - job: - pool: sonictest-ma - displayName: "kvmtest-multi-asic-t1-lag" - timeoutInMinutes: 240 - condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_CLASSICAL_TEST, 'YES')) - continueOnError: false - steps: - - template: .azure-pipelines/run-test-template.yml - parameters: - dut: vlab-08 - tbname: vms-kvm-four-asic-t1-lag - ptf_name: ptf_vms6-4 - tbtype: multi-asic-t1-lag-pr - image: sonic-4asic-vs.img.gz - - - job: multi_asic_testbedv2 - displayName: "kvmtest-multi-asic-t1-lag by TestbedV2" + - job: multi_asic_elastictest + displayName: "kvmtest-multi-asic-t1-lag by Elastictest" pool: ubuntu-20.04 timeoutInMinutes: 240 - condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES')) continueOnError: false steps: - template: .azure-pipelines/run-test-scheduler-template.yml @@ -276,11 +195,10 @@ stages: MAX_WORKER: $(MULTI_ASIC_INSTANCE_NUM) NUM_ASIC: 4 - - job: dualtor_testbedv2 + - job: dualtor_elastictest pool: ubuntu-20.04 - displayName: "kvmtest-dualtor-t0 by TestbedV2" + displayName: "kvmtest-dualtor-t0 by Elastictest" timeoutInMinutes: 240 - condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES')) continueOnError: false steps: - template: .azure-pipelines/run-test-scheduler-template.yml @@ -290,11 +208,10 @@ stages: MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM) COMMON_EXTRA_PARAMS: "--disable_loganalyzer " - - job: sonic_t0_testbedv2 - displayName: "kvmtest-t0-sonic by TestbedV2" + - job: sonic_t0_elastictest + displayName: "kvmtest-t0-sonic by Elastictest" pool: ubuntu-20.04 timeoutInMinutes: 240 - condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES')) continueOnError: false steps: - template: .azure-pipelines/run-test-scheduler-template.yml @@ -307,11 +224,10 @@ stages: VM_TYPE: vsonic SPECIFIED_PARAMS: '{\"test_pretest.py\":[\"--completeness_level=confident\",\"--allow_recover\"],\"test_posttest.py\":[\"--completeness_level=confident\",\"--allow_recover\"]}' - - job: wan_testbedv2 - displayName: "kvmtest-wan by TestbedV2" + - job: wan_elastictest + displayName: "kvmtest-wan by Elastictest" pool: ubuntu-20.04 timeoutInMinutes: 240 - condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES')) continueOnError: false steps: - template: .azure-pipelines/run-test-scheduler-template.yml