Skip to content

Commit 8dbf5fd

Browse files
r12fopcoder0sudhanshukumar22stepanblyschakyxieca
authored
[202412] Code sync sonic-net/sonic-buildimage:202411 => 202412 (sonic-net#1052)
Code sync sonic-net/sonic-buildimage:202411 => 202412 ``` * 903637b (HEAD -> code-sync-202412, origin/code-sync-202412) r12f 250424:0714 - Merge remote-tracking branch 'base/202411' into code-sync-202412 |\ | * 367199f (base/202411) mssonicbld 250423:1901 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (sonic-net#22412) | * 0da8b10 mssonicbld 250422:1901 - [submodule] Update submodule sonic-sairedis to the latest HEAD automatically (sonic-net#22397) | * 4700d35 mssonicbld 250418:1901 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (sonic-net#22364) | * 688b708 mssonicbld 250418:1901 - [CI]Add a pipeline to generates daily, successful virtual SONiC images (sonic-net#22368) | * c70a09c mssonicbld 250416:1601 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (sonic-net#22329) | * 1711475 mssonicbld 250416:0101 - [ci] Stop building slave docker for jessie and march (sonic-net#22331) | * 8f40740 Saikrishna Arcot 250414:1755 - [202411] Update to Linux 6.1.123 (sonic-net#21736) | * 2fd97fe mssonicbld 250411:1902 - [chassis-packet] Allow Fallback Route to get programmed on Downstream LC (sonic-net#21833) | * f2a76d5 Volodymyr Samotiy 250410:1845 - [202411][Mellanox] Integrate HW-MGMT Version 7.0040.2207 (sonic-net#22202) | * d9fd131 mssonicbld 250408:0920 - [submodule] Update submodule sonic-gnmi to the latest HEAD automatically (sonic-net#22258) | * bbd6e3c mssonicbld 250407:2200 - extend frr reconnect bmp retry interval from 1-2s into 10-15s. (sonic-net#22251) | * 3807de0 Aravind-Subbaroyan 250406:1803 - Update cisco-8000.ini (sonic-net#22247) | * bd3a419 Feng-msft 250407:1038 - Split frr_bmp feature switch for turn on FRR side bmp tunneling via Liquid (sonic-net#22243) | * b754560 mssonicbld 250404:1901 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (sonic-net#22232) | * fd4d058 zitingguo-ms 250404:0123 - [Broadcom] Upgrade xgs SAI to 12.3.6.2 (sonic-net#22219) | * 6042d69 mssonicbld 250404:0020 - [submodule] Update submodule sonic-sairedis to the latest HEAD automatically (sonic-net#22227) | * b9a0031 mssonicbld 250404:0020 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (sonic-net#22228) | * 2bb570a sschlafman 250403:0854 - [202411] Changed SKU name to Mellanox-SN4280-C48-202411 (sonic-net#22121) | * a06b315 sschlafman 250403:0854 - [202411] Add new T1 Mellanox-SN4280-O8V40 SKU for 202411 (sonic-net#22108) | * 6921735 Ying Xie 250403:0716 - [FRR] fix FRR mgmtd losing configuration issue (sonic-net#22183) | * f7cbdd9 Stepan Blyshchak 250402:2200 - [orchagent.sh] mask SIGHUP before starting orchagent (sonic-net#22208) | * 4765324 sudhanshukumar22 250401:2234 - [202411][FRR] Port Fix from FRR community for issue sonic-net#18493 | * 874cbf4 Sai Kiran 250401:1546 - [docker-ptf] Port changes from master (sonic-net#22185) ``` --------- Co-authored-by: Sai Kiran <[email protected]> Co-authored-by: sudhanshukumar22 <[email protected]> Co-authored-by: Stepan Blyshchak <[email protected]> Co-authored-by: Ying Xie <[email protected]> Co-authored-by: sschlafman <[email protected]> Co-authored-by: mssonicbld <[email protected]> Co-authored-by: zitingguo-ms <[email protected]> Co-authored-by: Feng-msft <[email protected]> Co-authored-by: Aravind-Subbaroyan <[email protected]> Co-authored-by: Volodymyr Samotiy <[email protected]> Co-authored-by: Saikrishna Arcot <[email protected]>
2 parents f7aad72 + 903637b commit 8dbf5fd

File tree

51 files changed

+2300
-26
lines changed

Some content is hidden

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

51 files changed

+2300
-26
lines changed

‎.azure-pipelines/docker-sonic-slave.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ parameters:
4848
- bullseye
4949
- buster
5050
- stretch
51-
- jessie
5251
- name: registry_url
5352
type: string
5453
default: sonicdev-microsoft.azurecr.io
@@ -61,14 +60,11 @@ stages:
6160
jobs:
6261
- ${{ each dist in parameters.dists }}:
6362
- ${{ if endswith(variables['Build.DefinitionName'], dist) }}:
64-
- ${{ each arch in parameters.arches }}:
65-
- template: .azure-pipelines/docker-sonic-slave-template.yml@buildimage
66-
parameters:
67-
pool: sonicbld-1es
68-
arch: ${{ arch }}
69-
dist: ${{ dist }}
70-
${{ if ne(arch, 'amd64') }}:
71-
march: _march_${{ arch }}
63+
- template: .azure-pipelines/docker-sonic-slave-template.yml@buildimage
64+
parameters:
65+
pool: sonicbld-1es
66+
arch: amd64
67+
dist: ${{ dist }}
7268
- stage: Build_native_arm
7369
dependsOn: []
7470
jobs:

‎.azure-pipelines/official-build-vs-with-test.yml

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
# This pipeline generates daily, successful virtual SONiC images, primarily for PR testing in non-build repositories.
2+
3+
name: $(Build.DefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)
4+
5+
schedules:
6+
- cron: "0 */8 * * *" # At 0 minutes past the hour, every 8 hours, every day UTC
7+
displayName: "Daily Build and Test SONiC virtual images"
8+
branches:
9+
include:
10+
- master
11+
- 202305
12+
- 202311
13+
- 202405
14+
- 202411
15+
16+
trigger: none
17+
pr: none
18+
19+
resources:
20+
repositories:
21+
- repository: sonic-mgmt
22+
type: github
23+
name: sonic-net/sonic-mgmt
24+
ref: master
25+
endpoint: sonic-net
26+
- repository: buildimage
27+
type: github
28+
name: sonic-net/sonic-buildimage
29+
endpoint: sonic-net
30+
ref: master
31+
32+
variables:
33+
- template: .azure-pipelines/template-variables.yml@buildimage
34+
- name: BUILD_BRANCH
35+
value: $(Build.SourceBranchName)
36+
37+
stages:
38+
- stage: BuildVS
39+
pool: sonicbld-1es
40+
jobs:
41+
- template: azure-pipelines-build.yml
42+
parameters:
43+
buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) BUILD_MULTIASIC_KVM=y INCLUDE_DHCP_SERVER=y ${{ variables.VERSION_CONTROL_OPTIONS }}'
44+
jobGroups:
45+
- name: vs
46+
47+
- stage: Test
48+
dependsOn: BuildVS
49+
condition: and(succeeded(), in(dependencies.BuildVS.result, 'Succeeded', 'SucceededWithIssues'))
50+
variables:
51+
- group: SONiC-Elastictest
52+
53+
jobs:
54+
- job: t0_elastictest
55+
pool: sonic-ubuntu-1c
56+
displayName: "kvmtest-t0 by Elastictest"
57+
timeoutInMinutes: 240
58+
continueOnError: false
59+
steps:
60+
- template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
61+
parameters:
62+
TOPOLOGY: t0
63+
MIN_WORKER: $(T0_INSTANCE_NUM)
64+
MAX_WORKER: $(T0_INSTANCE_NUM)
65+
MGMT_BRANCH: $(BUILD_BRANCH)
66+
67+
- job: t0_2vlans_elastictest
68+
pool: sonic-ubuntu-1c
69+
displayName: "kvmtest-t0-2vlans by Elastictest"
70+
timeoutInMinutes: 240
71+
continueOnError: false
72+
steps:
73+
- template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
74+
parameters:
75+
TOPOLOGY: t0
76+
TEST_SET: t0-2vlans
77+
MIN_WORKER: $(T0_2VLANS_INSTANCE_NUM)
78+
MAX_WORKER: $(T0_2VLANS_INSTANCE_NUM)
79+
MGMT_BRANCH: $(BUILD_BRANCH)
80+
DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"
81+
82+
- job: t1_lag_elastictest
83+
pool: sonic-ubuntu-1c
84+
displayName: "kvmtest-t1-lag by Elastictest"
85+
timeoutInMinutes: 240
86+
continueOnError: false
87+
steps:
88+
- template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
89+
parameters:
90+
TOPOLOGY: t1-lag
91+
MIN_WORKER: $(T1_LAG_INSTANCE_NUM)
92+
MAX_WORKER: $(T1_LAG_INSTANCE_NUM)
93+
MGMT_BRANCH: $(BUILD_BRANCH)
94+
95+
- job: multi_asic_elastictest
96+
displayName: "kvmtest-multi-asic-t1-lag by Elastictest"
97+
pool: sonic-ubuntu-1c
98+
timeoutInMinutes: 240
99+
continueOnError: false
100+
steps:
101+
- template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
102+
parameters:
103+
TOPOLOGY: t1-8-lag
104+
TEST_SET: multi-asic-t1-lag
105+
MIN_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
106+
MAX_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
107+
NUM_ASIC: 4
108+
MGMT_BRANCH: $(BUILD_BRANCH)
109+
110+
- job: dualtor_elastictest
111+
pool: sonic-ubuntu-1c
112+
displayName: "kvmtest-dualtor-t0 by Elastictest"
113+
timeoutInMinutes: 240
114+
continueOnError: false
115+
steps:
116+
- template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
117+
parameters:
118+
TOPOLOGY: dualtor
119+
MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
120+
MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
121+
MGMT_BRANCH: $(BUILD_BRANCH)
122+
COMMON_EXTRA_PARAMS: "--disable_loganalyzer "
123+
124+
- job: sonic_t0_elastictest
125+
displayName: "kvmtest-t0-sonic by Elastictest"
126+
pool: sonic-ubuntu-1c
127+
timeoutInMinutes: 240
128+
continueOnError: false
129+
steps:
130+
- template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
131+
parameters:
132+
TOPOLOGY: t0-64-32
133+
MIN_WORKER: $(T0_SONIC_INSTANCE_NUM)
134+
MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
135+
TEST_SET: t0-sonic
136+
MGMT_BRANCH: $(BUILD_BRANCH)
137+
COMMON_EXTRA_PARAMS: "--neighbor_type=sonic "
138+
VM_TYPE: vsonic
139+
140+
- job: dpu_elastictest
141+
displayName: "kvmtest-dpu by Elastictest"
142+
timeoutInMinutes: 240
143+
continueOnError: false
144+
pool: sonic-ubuntu-1c
145+
steps:
146+
- template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
147+
parameters:
148+
TOPOLOGY: dpu
149+
MIN_WORKER: $(T0_SONIC_INSTANCE_NUM)
150+
MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
151+
MGMT_BRANCH: $(BUILD_BRANCH)

‎device/mellanox/x86_64-nvidia_sn4280-r0/Mellanox-SN4280-C48/buffers.json.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../Mellanox-SN4280-O28/buffers.json.j2

‎device/mellanox/x86_64-nvidia_sn4280-r0/Mellanox-SN4280-C48/buffers_defaults_objects.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../Mellanox-SN4280-O28/buffers_defaults_objects.j2

‎device/mellanox/x86_64-nvidia_sn4280-r0/Mellanox-SN4280-C48/buffers_defaults_t0.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../Mellanox-SN4280-O28/buffers_defaults_t0.j2

‎device/mellanox/x86_64-nvidia_sn4280-r0/Mellanox-SN4280-C48/buffers_defaults_t1.j2

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{#
2+
Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
3+
Apache-2.0
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
#}
16+
{% set default_cable = '300m' %}
17+
{%-set ports2cable = {
18+
'spinerouter_leafrouter' : '2000m',
19+
'leafrouter_torrouter' : '300m'
20+
}
21+
-%}
22+
{% set ingress_lossless_pool_size = '50667520' %}
23+
{% set ingress_lossless_pool_xoff = '3854336' %}
24+
{% set egress_lossless_pool_size = '60817392' %}
25+
{% set egress_lossy_pool_size = '50667520' %}
26+
27+
{% import 'buffers_defaults_objects.j2' as defs with context %}
28+
29+
{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
30+
{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
31+
{%- endmacro %}
32+
33+
{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
34+
{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
35+
{%- endmacro %}
36+
37+
{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
38+
{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
39+
{%- endmacro %}
40+
41+
{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
42+
{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
43+
{%- endmacro %}
44+

‎device/mellanox/x86_64-nvidia_sn4280-r0/Mellanox-SN4280-C48/buffers_dynamic.json.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../Mellanox-SN4280-O28/buffers_dynamic.json.j2

0 commit comments

Comments
 (0)