Skip to content

Commit 178cbdb

Browse files
dypetdypet
committed
Merge remote-tracking branch 'origin/master' into soft_bfd
2 parents 166f05c + 34dfec7 commit 178cbdb

File tree

956 files changed

+83363
-56733
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

956 files changed

+83363
-56733
lines changed

‎.azure-pipelines/azure-pipelines-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
variables:
8383
dbg_image: yes
8484

85-
- name: innovium
85+
- name: marvell-teralynx
8686
variables:
8787
dbg_image: yes
8888

‎.azure-pipelines/azure-pipelines-repd-build-variables.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
variables:
2-
VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
2+
VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=py2,py3,web,git,docker'

‎.azure-pipelines/template-variables.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
variables:
22
DEFAULT_CONTAINER_REGISTRY: 'publicmirror.azurecr.io'
3-
COMMON_LIB_BUILD_ENVS: 'bullseye'
3+
COMMON_LIB_BUILD_ENVS: 'bookworm'
44
SONIC_SLAVE_DOCKER_DRIVER: 'overlay2'
55
SONIC_BUILD_RETRY_COUNT: 3
66
SONIC_BUILD_RETRY_INTERVAL: 600

‎.github/workflows/protect-file.yml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Protect certain files to avoid further changes
2+
3+
on:
4+
push:
5+
branches:
6+
- 'master'
7+
- '202[2-9][0-9][0-9]'
8+
pull_request:
9+
branches:
10+
- 'master'
11+
- '202[2-9][0-9][0-9]'
12+
13+
jobs:
14+
check-file:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout repository
18+
uses: actions/checkout@v3
19+
20+
- name: Fetch base branch
21+
run: |
22+
git fetch origin ${GITHUB_BASE_REF}
23+
24+
- name: Check protected files
25+
run: |
26+
echo "Starting file check step"
27+
protected_files=('src/sonic-config-engine/minigraph.py' 'files/build_templates/init_cfg.json.j2')
28+
base_branch=$(git rev-parse origin/${GITHUB_BASE_REF})
29+
30+
for protected_file in "${protected_files[@]}"; do
31+
echo "Checking ${protected_file}"
32+
if git diff --name-only $base_branch | grep -q "^${protected_file}\$"; then
33+
echo "Error: You are trying to modify ${protected_file}, which is protected."
34+
exit 1
35+
fi
36+
done
37+
echo "No changes detected in protected files"

‎.gitmodules

+4-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
[submodule "src/sonic-frr/frr"]
4747
path = src/sonic-frr/frr
4848
url = https://github.com/sonic-net/sonic-frr.git
49-
branch = frr/8.5
49+
branch = frr-10.0.1
5050
[submodule "platform/p4/p4-hlir/p4-hlir-v1.1"]
5151
path = platform/p4/p4-hlir/p4-hlir-v1.1
5252
url = https://github.com/p4lang/p4-hlir.git
@@ -130,3 +130,6 @@
130130
[submodule "platform/marvell-teralynx/sonic-platform-marvell-teralynx"]
131131
path = platform/marvell-teralynx/sonic-platform-marvell-teralynx
132132
url = https://github.com/Marvell-switching/sonic-platform-marvell.git
133+
[submodule "platform/vpp"]
134+
path = platform/vpp
135+
url = https://github.com/sonic-net/sonic-platform-vpp.git

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![Broadcom](https://dev.azure.com/mssonic/build/_apis/build/status/broadcom/Azure.sonic-buildimage.official.broadcom?branchName=master&label=Broadcom)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=138&branchName=master)
44
[![Centec](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec?branchName=master&label=Centec)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=143&branchName=master)
55
[![Centec(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec-arm64?branchName=master&label=Centec-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=140&branchName=master)
6-
[![Marvell-Teralynx](https://dev.azure.com/mssonic/build/_apis/build/status/marvell-teralynx/Azure.sonic-buildimage.official.innovium?branchName=master&label=Marvell-Teralynx)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=148&branchName=master)
6+
[![Marvell-Teralynx](https://dev.azure.com/mssonic/build/_apis/build/status/innovium/Azure.sonic-buildimage.official.marvell-teralynx?branchName=master&label=Marvell-Teralynx)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=148&branchName=master)
77
[![Mellanox](https://dev.azure.com/mssonic/build/_apis/build/status/mellanox/Azure.sonic-buildimage.official.mellanox?branchName=master&label=Mellanox)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=139&branchName=master)
88
[![Marvell(armhf)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-armhf?branchName=master&label=Marvell-armhf)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=141&branchName=master)
99
[![Marvell(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-arm64?branchName=master&label=Marvell-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=999&branchName=master)

‎azure-pipelines.yml

+3
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ stages:
7070
- name: broadcom
7171
variables:
7272
swi_image: yes
73+
docker_syncd_rpc_image: yes
74+
platform_rpc: brcm
7375
INCLUDE_RESTAPI: y
7476
- name: mellanox
7577
variables:
@@ -107,6 +109,7 @@ stages:
107109
- job:
108110
pool: sonictest
109111
displayName: "vstest"
112+
condition: false # agent pool don't work. disable this job to unblock PRs.
110113
timeoutInMinutes: 60
111114
steps:
112115
- template: .azure-pipelines/cleanup.yml

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/BALANCED/buffers_defaults_t0.j2

+11-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,17 @@
88
{%- endfor %}
99
{%- endmacro %}
1010

11+
{%- set ingress_lossless_pool_size = '32689152' %}
12+
{%- set egress_lossless_pool_size = '32340992' %}
13+
{%- if (DEVICE_METADATA is defined) and ('localhost' in DEVICE_METADATA) and ('subtype' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['subtype'] == 'DualToR') %}
14+
{%- set ingress_lossless_pool_size = '32441856' %}
15+
{%- set egress_lossless_pool_size = '32441856' %}
16+
{%- endif %}
17+
1118
{%- macro generate_buffer_pool_and_profiles() %}
1219
"BUFFER_POOL": {
1320
"ingress_lossless_pool": {
14-
"size": "32689152",
21+
"size": "{{ingress_lossless_pool_size }}",
1522
"type": "ingress",
1623
"mode": "dynamic",
1724
"xoff": "2058240"
@@ -22,7 +29,7 @@
2229
"mode": "dynamic"
2330
},
2431
"egress_lossless_pool": {
25-
"size": "32340992",
32+
"size": "{{egress_lossless_pool_size }}",
2633
"type": "egress",
2734
"mode": "static"
2835
}
@@ -31,12 +38,12 @@
3138
"ingress_lossy_profile": {
3239
"pool":"ingress_lossless_pool",
3340
"size":"0",
34-
"static_th":"32689152"
41+
"static_th":"{{ingress_lossless_pool_size }}"
3542
},
3643
"egress_lossless_profile": {
3744
"pool":"egress_lossless_pool",
3845
"size":"0",
39-
"static_th":"32340992"
46+
"static_th":"{{egress_lossless_pool_size }}"
4047
},
4148
"egress_lossy_profile": {
4249
"pool":"egress_lossy_pool",

‎device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32-200Gx48-100Gx32/th4-a7060dx5-32-200Gx48-100Gx32.config.bcm

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ bcm_device:
1919
0:
2020
global:
2121
pktio_mode: 1
22+
default_cpu_tx_queue: 7
2223
vlan_flooding_l2mc_num_reserved: 0
2324
ipv6_lpm_128b_enable: 1
2425
shared_block_mask_section: uc_bc

‎device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32-25Gx96-100Gx8-200Gx8/th4-a7060dx5-32-25Gx96-100Gx8-200Gx8.config.bcm

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ bcm_device:
2323
0:
2424
global:
2525
pktio_mode: 1
26+
default_cpu_tx_queue: 7
2627
vlan_flooding_l2mc_num_reserved: 0
2728
ipv6_lpm_128b_enable: 1
2829
shared_block_mask_section: uc_bc

‎device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/BALANCED

-1
This file was deleted.

‎device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers.json.j2

-2
This file was deleted.

‎device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers_defaults_t0.j2

-1
This file was deleted.

‎device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers_defaults_t1.j2

-1
This file was deleted.

‎device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/pg_profile_lookup.ini

-1
This file was deleted.

‎device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/qos.json.j2

-1
This file was deleted.

0 commit comments

Comments
 (0)