Skip to content

Commit

Permalink
Merge branch 'sonic-net:master' into bmp_db
Browse files Browse the repository at this point in the history
  • Loading branch information
FengPan-Frank authored Oct 23, 2024
2 parents 45ca700 + 8d09a2b commit 0924195
Show file tree
Hide file tree
Showing 614 changed files with 95,004 additions and 7,163 deletions.
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ endif
PLATFORM_PATH := platform/$(if $(PLATFORM),$(PLATFORM),$(CONFIGURED_PLATFORM))
PLATFORM_CHECKOUT := platform/checkout
PLATFORM_CHECKOUT_FILE := $(PLATFORM_CHECKOUT)/$(PLATFORM).ini
ifeq ($(SMARTSWITCH),1)
PLATFORM_CHECKOUT_FILE := $(PLATFORM_CHECKOUT)/$(PLATFORM)-smartswitch.ini
endif
PLATFORM_CHECKOUT_CMD := $(shell if [ -f $(PLATFORM_CHECKOUT_FILE) ]; then PLATFORM_PATH=$(PLATFORM_PATH) j2 $(PLATFORM_CHECKOUT)/template.j2 $(PLATFORM_CHECKOUT_FILE); fi)
MAKE_WITH_RETRY := ./scripts/run_with_retry $(MAKE)

Expand Down
32 changes: 16 additions & 16 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -295,22 +295,22 @@ stages:
MGMT_BRANCH: $(BUILD_BRANCH)
TEST_SET: onboarding_t1

- job: onboarding_elastictest_dualtor
displayName: "onboarding dualtor testcases by Elastictest - optional"
timeoutInMinutes: 240
continueOnError: true
pool: sonic-ubuntu-1c
steps:
- template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
parameters:
TOPOLOGY: dualtor
STOP_ON_FAILURE: "False"
RETRY_TIMES: 0
MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
MGMT_BRANCH: $(BUILD_BRANCH)
TEST_SET: onboarding_dualtor
# - job: onboarding_elastictest_dualtor
# displayName: "onboarding dualtor testcases by Elastictest - optional"
# timeoutInMinutes: 240
# continueOnError: true
# pool: sonic-ubuntu-1c
# steps:
# - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
# parameters:
# TOPOLOGY: dualtor
# STOP_ON_FAILURE: "False"
# RETRY_TIMES: 0
# MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
# MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
# KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
# MGMT_BRANCH: $(BUILD_BRANCH)
# TEST_SET: onboarding_dualtor

# - job: wan_elastictest
# displayName: "kvmtest-wan by Elastictest"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
{%- for port_idx in range(0, 512, 4) %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
{%- endfor %}
{%- endmacro %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{%- set default_topo = 't1' %}
{%- include 'buffers_config.j2' %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
{
"interfaces": {
"Ethernet0": {
"default_brkout_mode": "2x400G"
},
"Ethernet8": {
"default_brkout_mode": "2x400G"
},
"Ethernet16": {
"default_brkout_mode": "2x400G"
},
"Ethernet24": {
"default_brkout_mode": "2x400G"
},
"Ethernet32": {
"default_brkout_mode": "2x400G"
},
"Ethernet40": {
"default_brkout_mode": "2x400G"
},
"Ethernet48": {
"default_brkout_mode": "2x400G"
},
"Ethernet56": {
"default_brkout_mode": "2x400G"
},
"Ethernet64": {
"default_brkout_mode": "2x400G"
},
"Ethernet72": {
"default_brkout_mode": "2x400G"
},
"Ethernet80": {
"default_brkout_mode": "2x400G"
},
"Ethernet88": {
"default_brkout_mode": "2x400G"
},
"Ethernet96": {
"default_brkout_mode": "2x400G"
},
"Ethernet104": {
"default_brkout_mode": "2x400G"
},
"Ethernet112": {
"default_brkout_mode": "2x400G"
},
"Ethernet120": {
"default_brkout_mode": "2x400G"
},
"Ethernet128": {
"default_brkout_mode": "2x400G"
},
"Ethernet136": {
"default_brkout_mode": "2x400G"
},
"Ethernet144": {
"default_brkout_mode": "2x400G"
},
"Ethernet152": {
"default_brkout_mode": "2x400G"
},
"Ethernet160": {
"default_brkout_mode": "2x400G"
},
"Ethernet168": {
"default_brkout_mode": "2x400G"
},
"Ethernet176": {
"default_brkout_mode": "2x400G"
},
"Ethernet184": {
"default_brkout_mode": "2x400G"
},
"Ethernet192": {
"default_brkout_mode": "2x400G"
},
"Ethernet200": {
"default_brkout_mode": "2x400G"
},
"Ethernet208": {
"default_brkout_mode": "2x400G"
},
"Ethernet216": {
"default_brkout_mode": "2x400G"
},
"Ethernet224": {
"default_brkout_mode": "2x400G"
},
"Ethernet232": {
"default_brkout_mode": "2x400G"
},
"Ethernet240": {
"default_brkout_mode": "2x400G"
},
"Ethernet248": {
"default_brkout_mode": "2x400G"
},
"Ethernet256": {
"default_brkout_mode": "2x400G"
},
"Ethernet264": {
"default_brkout_mode": "2x400G"
},
"Ethernet272": {
"default_brkout_mode": "2x400G"
},
"Ethernet280": {
"default_brkout_mode": "2x400G"
},
"Ethernet288": {
"default_brkout_mode": "2x400G"
},
"Ethernet296": {
"default_brkout_mode": "2x400G"
},
"Ethernet304": {
"default_brkout_mode": "2x400G"
},
"Ethernet312": {
"default_brkout_mode": "2x400G"
},
"Ethernet320": {
"default_brkout_mode": "2x400G"
},
"Ethernet328": {
"default_brkout_mode": "2x400G"
},
"Ethernet336": {
"default_brkout_mode": "2x400G"
},
"Ethernet344": {
"default_brkout_mode": "2x400G"
},
"Ethernet352": {
"default_brkout_mode": "2x400G"
},
"Ethernet360": {
"default_brkout_mode": "2x400G"
},
"Ethernet368": {
"default_brkout_mode": "2x400G"
},
"Ethernet376": {
"default_brkout_mode": "2x400G"
},
"Ethernet384": {
"default_brkout_mode": "2x400G"
},
"Ethernet392": {
"default_brkout_mode": "2x400G"
},
"Ethernet400": {
"default_brkout_mode": "2x400G"
},
"Ethernet408": {
"default_brkout_mode": "2x400G"
},
"Ethernet416": {
"default_brkout_mode": "2x400G"
},
"Ethernet424": {
"default_brkout_mode": "2x400G"
},
"Ethernet432": {
"default_brkout_mode": "2x400G"
},
"Ethernet440": {
"default_brkout_mode": "2x400G"
},
"Ethernet448": {
"default_brkout_mode": "2x400G"
},
"Ethernet456": {
"default_brkout_mode": "2x400G"
},
"Ethernet464": {
"default_brkout_mode": "2x400G"
},
"Ethernet472": {
"default_brkout_mode": "2x400G"
},
"Ethernet480": {
"default_brkout_mode": "2x400G"
},
"Ethernet488": {
"default_brkout_mode": "2x400G"
},
"Ethernet496": {
"default_brkout_mode": "2x400G"
},
"Ethernet504": {
"default_brkout_mode": "2x400G"
},
"Ethernet512": {
"default_brkout_mode": "1x10G"
},
"Ethernet513": {
"default_brkout_mode": "1x10G"
}
}
}
Loading

0 comments on commit 0924195

Please sign in to comment.