From c9d03535e8e2163082b83bc3afc9143a02f31691 Mon Sep 17 00:00:00 2001 From: Yutong Zhang Date: Wed, 11 Dec 2024 14:00:23 +0800 Subject: [PATCH] Modify --- .../get-impacted-area.yml | 11 +- azure-pipelines.yml | 472 +++++++++--------- tests/telemetry/events/host_events.py | 1 - 3 files changed, 239 insertions(+), 245 deletions(-) diff --git a/.azure-pipelines/impacted_area_testing/get-impacted-area.yml b/.azure-pipelines/impacted_area_testing/get-impacted-area.yml index 0b1efdac724..716e3687386 100644 --- a/.azure-pipelines/impacted_area_testing/get-impacted-area.yml +++ b/.azure-pipelines/impacted_area_testing/get-impacted-area.yml @@ -22,7 +22,6 @@ steps: sudo apt-get install -y jq FINAL_FEATURES="" - echo "$(DIFF_FOLDERS)" IFS=' ' read -ra FEATURES_LIST <<< "$(DIFF_FOLDERS)" for FEATURE in "${FEATURES_LIST[@]}" do @@ -44,15 +43,11 @@ steps: FINAL_FEATURES="$FINAL_FEATURES,${FEATURE#tests/}" fi - # Just for test - elif [[ "$FEATURE" == *azure-pipelines* ]]; then - continue - # If changes related to other folders excpet tests, we also consider them as common part. # The scope of PR testing is all test scripts. - # else - # FINAL_FEATURES="" - # break + else + FINAL_FEATURES="" + break fi done diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f7931322e90..d6d2f270c62 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -23,36 +23,36 @@ trigger: none name: $(TeamProject)_$(Build.DefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r) stages: -#- stage: Pre_test -# jobs: -# - job: static_analysis -# displayName: "Static Analysis" -# timeoutInMinutes: 10 -# continueOnError: false -# pool: sonic-ubuntu-1c -# steps: -# - template: .azure-pipelines/pre-commit-check.yml +- stage: Pre_test + jobs: + - job: static_analysis + displayName: "Static Analysis" + timeoutInMinutes: 10 + continueOnError: false + pool: sonic-ubuntu-1c + steps: + - template: .azure-pipelines/pre-commit-check.yml -# - job: validate_test_cases -# displayName: "Validate Test Cases" -# timeoutInMinutes: 30 -# continueOnError: false -# pool: sonic-common -# steps: -# - template: .azure-pipelines/pytest-collect-only.yml -# parameters: -# MGMT_BRANCH: "" -# -# - job: dependency_check -# displayName: "Dependency Check" -# timeoutInMinutes: 10 -# pool: sonic-common -# steps: -# - template: .azure-pipelines/dependency-check.yml + - job: validate_test_cases + displayName: "Validate Test Cases" + timeoutInMinutes: 30 + continueOnError: false + pool: sonic-common + steps: + - template: .azure-pipelines/pytest-collect-only.yml + parameters: + MGMT_BRANCH: "" + + - job: dependency_check + displayName: "Dependency Check" + timeoutInMinutes: 10 + pool: sonic-common + steps: + - template: .azure-pipelines/dependency-check.yml - stage: Test -# dependsOn: Pre_test -# condition: and(succeeded(), in(dependencies.Pre_test.result, 'Succeeded')) + dependsOn: Pre_test + condition: and(succeeded(), in(dependencies.Pre_test.result, 'Succeeded')) variables: - group: SONiC-Elastictest - name: inventory @@ -97,290 +97,290 @@ stages: MAX_WORKER: $(INSTANCE_NUMBER) KVM_IMAGE_BRANCH: $(BUILD_BRANCH) MGMT_BRANCH: $(BUILD_BRANCH) -# -# - job: t0_elastictest -# displayName: "kvmtest-t0 by Elastictest" -# timeoutInMinutes: 240 -# continueOnError: false -# pool: sonic-ubuntu-1c -# steps: -# - template: .azure-pipelines/run-test-elastictest-template.yml -# parameters: -# TOPOLOGY: t0 -# MIN_WORKER: $(T0_INSTANCE_NUM) -# MAX_WORKER: $(T0_INSTANCE_NUM) -# KVM_IMAGE_BRANCH: $(BUILD_BRANCH) -# MGMT_BRANCH: "master" - - job: impacted_area_t0_2vlans_elastictest - displayName: "impacted-area-kvmtest-t0_2vlans by Elastictest" - dependsOn: get_impacted_area - condition: contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], 't0-2vlans') - variables: - TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ] + - job: t0_elastictest + displayName: "kvmtest-t0 by Elastictest" timeoutInMinutes: 240 - continueOnError: true + continueOnError: false pool: sonic-ubuntu-1c steps: - - template: .azure-pipelines/impacted_area_testing/calculate-instance-numbers.yml - parameters: - TOPOLOGY: t0-2vlans - BUILD_BRANCH: $(BUILD_BRANCH) + - template: .azure-pipelines/run-test-elastictest-template.yml + parameters: + TOPOLOGY: t0 + MIN_WORKER: $(T0_INSTANCE_NUM) + MAX_WORKER: $(T0_INSTANCE_NUM) + KVM_IMAGE_BRANCH: $(BUILD_BRANCH) + MGMT_BRANCH: "master" - - template: .azure-pipelines/run-test-elastictest-template.yml - parameters: - TOPOLOGY: t0 - SCRIPTS: $(SCRIPTS) - MIN_WORKER: $(INSTANCE_NUMBER) - MAX_WORKER: $(INSTANCE_NUMBER) - KVM_IMAGE_BRANCH: $(BUILD_BRANCH) - MGMT_BRANCH: $(BUILD_BRANCH) - -# - job: t0_2vlans_elastictest -# displayName: "kvmtest-t0-2vlans by Elastictest" +# - job: impacted_area_t0_2vlans_elastictest +# displayName: "impacted-area-kvmtest-t0_2vlans by Elastictest" +# dependsOn: get_impacted_area +# condition: contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], 't0-2vlans') +# variables: +# TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ] # timeoutInMinutes: 240 -# continueOnError: false +# continueOnError: true # pool: sonic-ubuntu-1c # steps: -# - template: .azure-pipelines/run-test-elastictest-template.yml -# parameters: -# TOPOLOGY: t0 -# TEST_SET: t0-2vlans -# MIN_WORKER: $(T0_2VLANS_INSTANCE_NUM) -# MAX_WORKER: $(T0_2VLANS_INSTANCE_NUM) -# DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a" -# KVM_IMAGE_BRANCH: $(BUILD_BRANCH) -# MGMT_BRANCH: "master" +# - template: .azure-pipelines/impacted_area_testing/calculate-instance-numbers.yml +# parameters: +# TOPOLOGY: t0-2vlans +# BUILD_BRANCH: $(BUILD_BRANCH) +# +# - template: .azure-pipelines/run-test-elastictest-template.yml +# parameters: +# TOPOLOGY: t0 +# SCRIPTS: $(SCRIPTS) +# MIN_WORKER: $(INSTANCE_NUMBER) +# MAX_WORKER: $(INSTANCE_NUMBER) +# KVM_IMAGE_BRANCH: $(BUILD_BRANCH) +# MGMT_BRANCH: $(BUILD_BRANCH) - - job: impacted_area_t1_lag_elastictest - displayName: "impacted-area-kvmtest-t1-lag by Elastictest" - dependsOn: get_impacted_area - condition: or(contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], 't1'), eq(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], '')) - variables: - TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ] + - job: t0_2vlans_elastictest + displayName: "kvmtest-t0-2vlans by Elastictest" timeoutInMinutes: 240 - continueOnError: true + continueOnError: false pool: sonic-ubuntu-1c steps: - - template: .azure-pipelines/impacted_area_testing/calculate-instance-numbers.yml - parameters: - TOPOLOGY: t1 - BUILD_BRANCH: $(BUILD_BRANCH) + - template: .azure-pipelines/run-test-elastictest-template.yml + parameters: + TOPOLOGY: t0 + TEST_SET: t0-2vlans + MIN_WORKER: $(T0_2VLANS_INSTANCE_NUM) + MAX_WORKER: $(T0_2VLANS_INSTANCE_NUM) + DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a" + KVM_IMAGE_BRANCH: $(BUILD_BRANCH) + MGMT_BRANCH: "master" - - template: .azure-pipelines/run-test-elastictest-template.yml - parameters: - TOPOLOGY: t1-lag - SCRIPTS: $(SCRIPTS) - MIN_WORKER: $(INSTANCE_NUMBER) - MAX_WORKER: $(INSTANCE_NUMBER) - KVM_IMAGE_BRANCH: $(BUILD_BRANCH) - MGMT_BRANCH: $(BUILD_BRANCH) - -# - job: t1_lag_elastictest -# displayName: "kvmtest-t1-lag by Elastictest" +# - job: impacted_area_t1_lag_elastictest +# displayName: "impacted-area-kvmtest-t1-lag by Elastictest" +# dependsOn: get_impacted_area +# condition: or(contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], 't1'), eq(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], '')) +# variables: +# TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ] # timeoutInMinutes: 240 -# continueOnError: false +# continueOnError: true # pool: sonic-ubuntu-1c # steps: -# - template: .azure-pipelines/run-test-elastictest-template.yml -# parameters: -# TOPOLOGY: t1-lag -# MIN_WORKER: $(T1_LAG_INSTANCE_NUM) -# MAX_WORKER: $(T1_LAG_INSTANCE_NUM) -# KVM_IMAGE_BRANCH: $(BUILD_BRANCH) -# MGMT_BRANCH: "master" +# - template: .azure-pipelines/impacted_area_testing/calculate-instance-numbers.yml +# parameters: +# TOPOLOGY: t1 +# BUILD_BRANCH: $(BUILD_BRANCH) +# +# - template: .azure-pipelines/run-test-elastictest-template.yml +# parameters: +# TOPOLOGY: t1-lag +# SCRIPTS: $(SCRIPTS) +# MIN_WORKER: $(INSTANCE_NUMBER) +# MAX_WORKER: $(INSTANCE_NUMBER) +# KVM_IMAGE_BRANCH: $(BUILD_BRANCH) +# MGMT_BRANCH: $(BUILD_BRANCH) - - job: impacted_area_dualtor_elastictest - displayName: "impacted-area-kvmtest-dualtor by Elastictest" - dependsOn: get_impacted_area - condition: contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], 'dualtor') - variables: - TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ] + - job: t1_lag_elastictest + displayName: "kvmtest-t1-lag by Elastictest" timeoutInMinutes: 240 - continueOnError: true + continueOnError: false pool: sonic-ubuntu-1c steps: - - template: .azure-pipelines/impacted_area_testing/calculate-instance-numbers.yml - parameters: - TOPOLOGY: dualtor - BUILD_BRANCH: $(BUILD_BRANCH) + - template: .azure-pipelines/run-test-elastictest-template.yml + parameters: + TOPOLOGY: t1-lag + MIN_WORKER: $(T1_LAG_INSTANCE_NUM) + MAX_WORKER: $(T1_LAG_INSTANCE_NUM) + KVM_IMAGE_BRANCH: $(BUILD_BRANCH) + MGMT_BRANCH: "master" - - template: .azure-pipelines/run-test-elastictest-template.yml - parameters: - TOPOLOGY: dualtor - SCRIPTS: $(SCRIPTS) - MIN_WORKER: $(INSTANCE_NUMBER) - MAX_WORKER: $(INSTANCE_NUMBER) - KVM_IMAGE_BRANCH: $(BUILD_BRANCH) - MGMT_BRANCH: $(BUILD_BRANCH) - -# - job: dualtor_elastictest -# displayName: "kvmtest-dualtor-t0 by Elastictest" +# - job: impacted_area_dualtor_elastictest +# displayName: "impacted-area-kvmtest-dualtor by Elastictest" +# dependsOn: get_impacted_area +# condition: contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], 'dualtor') +# variables: +# TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ] # timeoutInMinutes: 240 -# continueOnError: false +# continueOnError: true # pool: sonic-ubuntu-1c # steps: +# - template: .azure-pipelines/impacted_area_testing/calculate-instance-numbers.yml +# parameters: +# TOPOLOGY: dualtor +# BUILD_BRANCH: $(BUILD_BRANCH) +# # - template: .azure-pipelines/run-test-elastictest-template.yml # parameters: # TOPOLOGY: dualtor -# MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM) -# MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM) -# COMMON_EXTRA_PARAMS: "--disable_loganalyzer " +# SCRIPTS: $(SCRIPTS) +# MIN_WORKER: $(INSTANCE_NUMBER) +# MAX_WORKER: $(INSTANCE_NUMBER) # KVM_IMAGE_BRANCH: $(BUILD_BRANCH) -# MGMT_BRANCH: "master" +# MGMT_BRANCH: $(BUILD_BRANCH) - - job: impacted_area_multi_asic_elastictest - displayName: "impacted-area-kvmtest-multi_asic by Elastictest" - dependsOn: get_impacted_area - condition: contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], 't1-multi-asic') - variables: - TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ] + - job: dualtor_elastictest + displayName: "kvmtest-dualtor-t0 by Elastictest" timeoutInMinutes: 240 - continueOnError: true + continueOnError: false pool: sonic-ubuntu-1c steps: - - template: .azure-pipelines/impacted_area_testing/calculate-instance-numbers.yml - parameters: - TOPOLOGY: t1-multi-asic - BUILD_BRANCH: $(BUILD_BRANCH) - - template: .azure-pipelines/run-test-elastictest-template.yml parameters: - TOPOLOGY: t1-8-lag - SCRIPTS: $(SCRIPTS) - MIN_WORKER: $(INSTANCE_NUMBER) - MAX_WORKER: $(INSTANCE_NUMBER) + TOPOLOGY: dualtor + MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM) + MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM) + COMMON_EXTRA_PARAMS: "--disable_loganalyzer " KVM_IMAGE_BRANCH: $(BUILD_BRANCH) - MGMT_BRANCH: $(BUILD_BRANCH) + MGMT_BRANCH: "master" -# - job: multi_asic_elastictest -# displayName: "kvmtest-multi-asic-t1-lag by Elastictest" +# - job: impacted_area_multi_asic_elastictest +# displayName: "impacted-area-kvmtest-multi_asic by Elastictest" +# dependsOn: get_impacted_area +# condition: contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], 't1-multi-asic') +# variables: +# TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ] # timeoutInMinutes: 240 -# continueOnError: false +# continueOnError: true # pool: sonic-ubuntu-1c # steps: +# - template: .azure-pipelines/impacted_area_testing/calculate-instance-numbers.yml +# parameters: +# TOPOLOGY: t1-multi-asic +# BUILD_BRANCH: $(BUILD_BRANCH) +# # - template: .azure-pipelines/run-test-elastictest-template.yml # parameters: # TOPOLOGY: t1-8-lag -# TEST_SET: multi-asic-t1-lag -# MIN_WORKER: $(MULTI_ASIC_INSTANCE_NUM) -# MAX_WORKER: $(MULTI_ASIC_INSTANCE_NUM) -# NUM_ASIC: 4 +# SCRIPTS: $(SCRIPTS) +# MIN_WORKER: $(INSTANCE_NUMBER) +# MAX_WORKER: $(INSTANCE_NUMBER) # KVM_IMAGE_BRANCH: $(BUILD_BRANCH) -# MGMT_BRANCH: "master" +# MGMT_BRANCH: $(BUILD_BRANCH) - - job: impacted_area_sonic_t0_elastictest - displayName: "impacted-area-kvmtest-sonic_t0 by Elastictest" - dependsOn: get_impacted_area - condition: contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], 't0-sonic') - variables: - TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ] + - job: multi_asic_elastictest + displayName: "kvmtest-multi-asic-t1-lag by Elastictest" timeoutInMinutes: 240 - continueOnError: true + continueOnError: false pool: sonic-ubuntu-1c steps: - - template: .azure-pipelines/impacted_area_testing/calculate-instance-numbers.yml - parameters: - TOPOLOGY: t0-sonic - BUILD_BRANCH: $(BUILD_BRANCH) - - template: .azure-pipelines/run-test-elastictest-template.yml parameters: - TOPOLOGY: t0-64-32 - SCRIPTS: $(SCRIPTS) - MIN_WORKER: $(INSTANCE_NUMBER) - MAX_WORKER: $(INSTANCE_NUMBER) + TOPOLOGY: t1-8-lag + TEST_SET: multi-asic-t1-lag + MIN_WORKER: $(MULTI_ASIC_INSTANCE_NUM) + MAX_WORKER: $(MULTI_ASIC_INSTANCE_NUM) + NUM_ASIC: 4 KVM_IMAGE_BRANCH: $(BUILD_BRANCH) - MGMT_BRANCH: $(BUILD_BRANCH) + MGMT_BRANCH: "master" -# - job: sonic_t0_elastictest -# displayName: "kvmtest-t0-sonic by Elastictest" +# - job: impacted_area_sonic_t0_elastictest +# displayName: "impacted-area-kvmtest-sonic_t0 by Elastictest" +# dependsOn: get_impacted_area +# condition: contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], 't0-sonic') +# variables: +# TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ] # timeoutInMinutes: 240 -# continueOnError: false +# continueOnError: true # pool: sonic-ubuntu-1c # steps: +# - template: .azure-pipelines/impacted_area_testing/calculate-instance-numbers.yml +# parameters: +# TOPOLOGY: t0-sonic +# BUILD_BRANCH: $(BUILD_BRANCH) +# # - template: .azure-pipelines/run-test-elastictest-template.yml # parameters: # TOPOLOGY: t0-64-32 -# MIN_WORKER: $(T0_SONIC_INSTANCE_NUM) -# MAX_WORKER: $(T0_SONIC_INSTANCE_NUM) -# TEST_SET: t0-sonic -# COMMON_EXTRA_PARAMS: "--neighbor_type=sonic " -# VM_TYPE: vsonic +# SCRIPTS: $(SCRIPTS) +# MIN_WORKER: $(INSTANCE_NUMBER) +# MAX_WORKER: $(INSTANCE_NUMBER) # KVM_IMAGE_BRANCH: $(BUILD_BRANCH) -# MGMT_BRANCH: "master" +# MGMT_BRANCH: $(BUILD_BRANCH) - - job: impacted_area_dpu_elastictest - displayName: "impacted-area-kvmtest-dpu by Elastictest" - dependsOn: get_impacted_area - condition: contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], 'dpu') - variables: - TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ] + - job: sonic_t0_elastictest + displayName: "kvmtest-t0-sonic by Elastictest" timeoutInMinutes: 240 - continueOnError: true + continueOnError: false pool: sonic-ubuntu-1c steps: - - template: .azure-pipelines/impacted_area_testing/calculate-instance-numbers.yml - parameters: - TOPOLOGY: dpu - BUILD_BRANCH: $(BUILD_BRANCH) - - template: .azure-pipelines/run-test-elastictest-template.yml parameters: - TOPOLOGY: dpu - SCRIPTS: $(SCRIPTS) - MIN_WORKER: $(INSTANCE_NUMBER) - MAX_WORKER: $(INSTANCE_NUMBER) + TOPOLOGY: t0-64-32 + MIN_WORKER: $(T0_SONIC_INSTANCE_NUM) + MAX_WORKER: $(T0_SONIC_INSTANCE_NUM) + TEST_SET: t0-sonic + COMMON_EXTRA_PARAMS: "--neighbor_type=sonic " + VM_TYPE: vsonic KVM_IMAGE_BRANCH: $(BUILD_BRANCH) - MGMT_BRANCH: $(BUILD_BRANCH) - -# - job: dpu_elastictest -# displayName: "kvmtest-dpu by Elastictest" -# timeoutInMinutes: 240 -# continueOnError: false -# pool: sonic-ubuntu-1c -# steps: -# - template: .azure-pipelines/run-test-elastictest-template.yml -# parameters: -# TOPOLOGY: dpu -# MIN_WORKER: $(T0_SONIC_INSTANCE_NUM) -# MAX_WORKER: $(T0_SONIC_INSTANCE_NUM) -# KVM_IMAGE_BRANCH: $(BUILD_BRANCH) -# MGMT_BRANCH: "master" + MGMT_BRANCH: "master" -# - job: onboarding_elastictest_t0 -# displayName: "onboarding t0 testcases by Elastictest - optional" +# - job: impacted_area_dpu_elastictest +# displayName: "impacted-area-kvmtest-dpu by Elastictest" +# dependsOn: get_impacted_area +# condition: contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], 'dpu') +# variables: +# TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ] # timeoutInMinutes: 240 # continueOnError: true # pool: sonic-ubuntu-1c # steps: -# - template: .azure-pipelines/run-test-elastictest-template.yml +# - template: .azure-pipelines/impacted_area_testing/calculate-instance-numbers.yml # parameters: -# TOPOLOGY: t0 -# STOP_ON_FAILURE: "False" -# RETRY_TIMES: 0 -# MIN_WORKER: $(T0_ONBOARDING_SONIC_INSTANCE_NUM) -# MAX_WORKER: $(T0_ONBOARDING_SONIC_INSTANCE_NUM) -# KVM_IMAGE_BRANCH: $(BUILD_BRANCH) -# MGMT_BRANCH: "master" -# TEST_SET: onboarding_t0 +# TOPOLOGY: dpu +# BUILD_BRANCH: $(BUILD_BRANCH) # -# - job: onboarding_elastictest_t1 -# displayName: "onboarding t1 testcases by Elastictest - optional" -# timeoutInMinutes: 240 -# continueOnError: true -# pool: sonic-ubuntu-1c -# steps: # - template: .azure-pipelines/run-test-elastictest-template.yml # parameters: -# TOPOLOGY: t1-lag -# STOP_ON_FAILURE: "False" -# RETRY_TIMES: 0 -# MIN_WORKER: $(T1_LAG_ONBOARDING_INSTANCE_NUM) -# MAX_WORKER: $(T1_LAG_ONBOARDING_INSTANCE_NUM) +# TOPOLOGY: dpu +# SCRIPTS: $(SCRIPTS) +# MIN_WORKER: $(INSTANCE_NUMBER) +# MAX_WORKER: $(INSTANCE_NUMBER) # KVM_IMAGE_BRANCH: $(BUILD_BRANCH) -# MGMT_BRANCH: "master" -# TEST_SET: onboarding_t1 +# MGMT_BRANCH: $(BUILD_BRANCH) + + - job: dpu_elastictest + displayName: "kvmtest-dpu by Elastictest" + timeoutInMinutes: 240 + continueOnError: false + pool: sonic-ubuntu-1c + steps: + - template: .azure-pipelines/run-test-elastictest-template.yml + parameters: + TOPOLOGY: dpu + MIN_WORKER: $(T0_SONIC_INSTANCE_NUM) + MAX_WORKER: $(T0_SONIC_INSTANCE_NUM) + KVM_IMAGE_BRANCH: $(BUILD_BRANCH) + MGMT_BRANCH: "master" + + - job: onboarding_elastictest_t0 + displayName: "onboarding t0 testcases by Elastictest - optional" + timeoutInMinutes: 240 + continueOnError: true + pool: sonic-ubuntu-1c + steps: + - template: .azure-pipelines/run-test-elastictest-template.yml + parameters: + TOPOLOGY: t0 + STOP_ON_FAILURE: "False" + RETRY_TIMES: 0 + MIN_WORKER: $(T0_ONBOARDING_SONIC_INSTANCE_NUM) + MAX_WORKER: $(T0_ONBOARDING_SONIC_INSTANCE_NUM) + KVM_IMAGE_BRANCH: $(BUILD_BRANCH) + MGMT_BRANCH: "master" + TEST_SET: onboarding_t0 + + - job: onboarding_elastictest_t1 + displayName: "onboarding t1 testcases by Elastictest - optional" + timeoutInMinutes: 240 + continueOnError: true + pool: sonic-ubuntu-1c + steps: + - template: .azure-pipelines/run-test-elastictest-template.yml + parameters: + TOPOLOGY: t1-lag + STOP_ON_FAILURE: "False" + RETRY_TIMES: 0 + MIN_WORKER: $(T1_LAG_ONBOARDING_INSTANCE_NUM) + MAX_WORKER: $(T1_LAG_ONBOARDING_INSTANCE_NUM) + KVM_IMAGE_BRANCH: $(BUILD_BRANCH) + MGMT_BRANCH: "master" + TEST_SET: onboarding_t1 # - job: onboarding_elastictest_dualtor # displayName: "onboarding dualtor testcases by Elastictest - optional" diff --git a/tests/telemetry/events/host_events.py b/tests/telemetry/events/host_events.py index fc11950688d..24cacc521d6 100644 --- a/tests/telemetry/events/host_events.py +++ b/tests/telemetry/events/host_events.py @@ -9,7 +9,6 @@ from tests.common.helpers.dut_utils import is_container_running from tests.common.utilities import wait_until - logger = logging.getLogger(__name__) tag = "sonic-events-host"