Skip to content

Commit ae6fe5d

Browse files
yejianquanyejianquan
committed
Merged PR 8419167: Fix master merge conflict
Related work items: sonic-net#94, sonic-net#13789, sonic-net#14149, sonic-net#14515, sonic-net#14788, sonic-net#14922, sonic-net#14933, sonic-net#15284, sonic-net#15383, sonic-net#15464, sonic-net#15519, sonic-net#15521, sonic-net#15575, sonic-net#15636, sonic-net#15652, sonic-net#15684, sonic-net#15708, sonic-net#15725, sonic-net#15739, sonic-net#15755, sonic-net#15756, sonic-net#15757
2 parents 2662653 + 82fd7cb commit ae6fe5d

File tree

127 files changed

+13092
-106
lines changed

Some content is hidden

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

127 files changed

+13092
-106
lines changed

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

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# C/C++ with GCC
2+
# Build your C/C++ project with GCC using make.
3+
# Add steps that publish test results, save build artifacts, deploy, and more:
4+
# https://docs.microsoft.com/azure/devops/pipelines/apps/c-cpp/gcc
5+
pr: none
6+
7+
trigger:
8+
batch: true
9+
branches:
10+
include:
11+
- master
12+
13+
stages:
14+
- stage: Build
15+
16+
jobs:
17+
- job:
18+
displayName: "amd64/ubuntu-20.04"
19+
pool:
20+
vmImage: 'ubuntu-20.04'
21+
22+
steps:
23+
- checkout: self
24+
submodules: true
25+
- script: |
26+
sudo apt-get update
27+
sudo apt-get install -y make wget libtool m4 autoconf dh-exec libdebhelper-perl=13.6ubuntu1~bpo20.04.1 debhelper=13.6ubuntu1~bpo20.04.1 \
28+
cmake pkg-config python3-pip python cmake libgtest-dev libgmock-dev libyang-dev \
29+
debhelper-compat dh-elpa dh-sequence-python3 python3-all \
30+
libpython3-all-dev python3-six xmlto unzip rake-compiler gem2deb pkg-php-tools \
31+
ant default-jdk maven-repo-helper libguava-java
32+
wget http://ftp.us.debian.org/debian/pool/main/libg/libgoogle-gson-java/libgoogle-gson-java_2.8.6-1+deb11u1_all.deb
33+
sudo dpkg -i libgoogle-gson-java_2.8.6-1+deb11u1_all.deb
34+
mkdir -p /tmp/artifacts
35+
displayName: "Install dependencies"
36+
- script: |
37+
SONIC_CONFIG_MAKE_JOBS=$(nproc) CONFIGURED_ARCH=amd64 DEST=/tmp/artifacts make -f ../rules/protobuf.mk -f protobuf/Makefile
38+
workingDirectory: src
39+
displayName: "Build protobuf"
40+
- script: |
41+
sudo dpkg -i protobuf-compiler_3.21.12-3_amd64.deb libprotoc32_3.21.12-3_amd64.deb \
42+
libprotobuf32_3.21.12-3_amd64.deb libprotobuf-dev_3.21.12-3_amd64.deb \
43+
libprotobuf-lite32_3.21.12-3_amd64.deb
44+
workingDirectory: /tmp/artifacts
45+
displayName: "Install protobuf"
46+
- script: |
47+
dpkg-buildpackage -rfakeroot -b -us -uc
48+
workingDirectory: src/sonic-dash-api
49+
displayName: "Build sonic-dash-api"
50+
- script: |
51+
cp *.deb /tmp/artifacts
52+
workingDirectory: src
53+
- publish: /tmp/artifacts
54+
artifact: sonic-buildimage.amd64.ubuntu20_04
55+
displayName: "Archive sonic-buildimage debian packages for ubuntu20.04"

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -121,3 +121,6 @@
121121
[submodule "src/dhcpmon"]
122122
path = src/dhcpmon
123123
url = https://github.com/sonic-net/sonic-dhcpmon.git
124+
[submodule "src/sonic-dash-api/sonic-dash-api"]
125+
path = src/sonic-dash-api/sonic-dash-api
126+
url = https://github.com/sonic-net/sonic-dash-api.git

‎azure-pipelines.yml

+18-12
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ stages:
157157
TOPOLOGY: t0
158158
MIN_WORKER: $(T0_INSTANCE_NUM)
159159
MAX_WORKER: $(T0_INSTANCE_NUM)
160+
MGMT_BRANCH: master
160161

161162
- job: t0_2vlans_elastictest
162163
pool: ubuntu-20.04
@@ -170,6 +171,7 @@ stages:
170171
TEST_SET: t0-2vlans
171172
MIN_WORKER: $(T0_2VLANS_INSTANCE_NUM)
172173
MAX_WORKER: $(T0_2VLANS_INSTANCE_NUM)
174+
MGMT_BRANCH: master
173175
DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a"
174176

175177
- job: t1_lag_elastictest
@@ -183,6 +185,7 @@ stages:
183185
TOPOLOGY: t1-lag
184186
MIN_WORKER: $(T1_LAG_INSTANCE_NUM)
185187
MAX_WORKER: $(T1_LAG_INSTANCE_NUM)
188+
MGMT_BRANCH: master
186189

187190
- job: multi_asic_elastictest
188191
displayName: "kvmtest-multi-asic-t1-lag by Elastictest"
@@ -197,6 +200,7 @@ stages:
197200
MIN_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
198201
MAX_WORKER: $(MULTI_ASIC_INSTANCE_NUM)
199202
NUM_ASIC: 4
203+
MGMT_BRANCH: master
200204

201205
- job: dualtor_elastictest
202206
pool: ubuntu-20.04
@@ -209,6 +213,7 @@ stages:
209213
TOPOLOGY: dualtor
210214
MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
211215
MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
216+
MGMT_BRANCH: master
212217
COMMON_EXTRA_PARAMS: "--disable_loganalyzer "
213218

214219
- job: sonic_t0_elastictest
@@ -223,18 +228,19 @@ stages:
223228
MIN_WORKER: $(T0_SONIC_INSTANCE_NUM)
224229
MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
225230
TEST_SET: t0-sonic
231+
MGMT_BRANCH: master
226232
COMMON_EXTRA_PARAMS: "--neighbor_type=sonic "
227233
VM_TYPE: vsonic
228234

229-
- job: wan_elastictest
230-
displayName: "kvmtest-wan by Elastictest"
231-
pool: ubuntu-20.04
232-
timeoutInMinutes: 240
233-
continueOnError: false
234-
steps:
235-
- template: .azure-pipelines/run-test-scheduler-template.yml
236-
parameters:
237-
TOPOLOGY: wan-pub
238-
MIN_WORKER: $(WAN_INSTANCE_NUM)
239-
MAX_WORKER: $(WAN_INSTANCE_NUM)
240-
COMMON_EXTRA_PARAMS: "--skip_sanity "
235+
# - job: wan_elastictest
236+
# displayName: "kvmtest-wan by Elastictest"
237+
# pool: ubuntu-20.04
238+
# timeoutInMinutes: 240
239+
# continueOnError: false
240+
# steps:
241+
# - template: .azure-pipelines/run-test-scheduler-template.yml
242+
# parameters:
243+
# TOPOLOGY: wan-pub
244+
# MIN_WORKER: $(WAN_INSTANCE_NUM)
245+
# MAX_WORKER: $(WAN_INSTANCE_NUM)
246+
# COMMON_EXTRA_PARAMS: "--skip_sanity "

‎build_debian.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ set -x -e
3131
CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
3232

3333
## docker engine version (with platform)
34-
DOCKER_VERSION=5:20.10.14~3-0~debian-$IMAGE_DISTRO
35-
CONTAINERD_IO_VERSION=1.5.11-1
34+
DOCKER_VERSION=5:24.0.2-1~debian.11~$IMAGE_DISTRO
35+
CONTAINERD_IO_VERSION=1.6.21-1
3636
LINUX_KERNEL_VERSION=5.10.0-18-2
3737

3838
## Working directory to prepare the file system

‎device/ufispace/x86_64-ufispace_s9300_32d-r0/UFISPACE-S9300-32D/hwsku.json

+140
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
{
2+
"interfaces": {
3+
"Ethernet0": {
4+
"default_brkout_mode": "1x400G"
5+
},
6+
7+
"Ethernet8": {
8+
"default_brkout_mode": "1x400G"
9+
},
10+
11+
"Ethernet16": {
12+
"default_brkout_mode": "1x400G"
13+
},
14+
15+
"Ethernet24": {
16+
"default_brkout_mode": "1x400G"
17+
},
18+
19+
"Ethernet32": {
20+
"default_brkout_mode": "1x400G"
21+
},
22+
23+
"Ethernet40": {
24+
"default_brkout_mode": "1x400G"
25+
},
26+
27+
"Ethernet48": {
28+
"default_brkout_mode": "1x400G"
29+
},
30+
31+
"Ethernet56": {
32+
"default_brkout_mode": "1x400G"
33+
},
34+
35+
"Ethernet64": {
36+
"default_brkout_mode": "1x400G"
37+
},
38+
39+
"Ethernet72": {
40+
"default_brkout_mode": "1x400G"
41+
},
42+
43+
"Ethernet80": {
44+
"default_brkout_mode": "1x400G"
45+
},
46+
47+
"Ethernet88": {
48+
"default_brkout_mode": "1x400G"
49+
},
50+
51+
"Ethernet96": {
52+
"default_brkout_mode": "1x400G"
53+
},
54+
55+
"Ethernet104": {
56+
"default_brkout_mode": "1x400G"
57+
},
58+
59+
"Ethernet112": {
60+
"default_brkout_mode": "1x400G"
61+
},
62+
63+
"Ethernet120": {
64+
"default_brkout_mode": "1x400G"
65+
},
66+
67+
"Ethernet128": {
68+
"default_brkout_mode": "1x400G"
69+
},
70+
71+
"Ethernet136": {
72+
"default_brkout_mode": "1x400G"
73+
},
74+
75+
"Ethernet144": {
76+
"default_brkout_mode": "1x400G"
77+
},
78+
79+
"Ethernet152": {
80+
"default_brkout_mode": "1x400G"
81+
},
82+
83+
"Ethernet160": {
84+
"default_brkout_mode": "1x400G"
85+
},
86+
87+
"Ethernet168": {
88+
"default_brkout_mode": "1x400G"
89+
},
90+
91+
"Ethernet176": {
92+
"default_brkout_mode": "1x400G"
93+
},
94+
95+
"Ethernet184": {
96+
"default_brkout_mode": "1x400G"
97+
},
98+
99+
"Ethernet192": {
100+
"default_brkout_mode": "1x400G"
101+
},
102+
103+
"Ethernet200": {
104+
"default_brkout_mode": "1x400G"
105+
},
106+
107+
"Ethernet208": {
108+
"default_brkout_mode": "1x400G"
109+
},
110+
111+
"Ethernet216": {
112+
"default_brkout_mode": "1x400G"
113+
},
114+
115+
"Ethernet224": {
116+
"default_brkout_mode": "1x400G"
117+
},
118+
119+
"Ethernet232": {
120+
"default_brkout_mode": "1x400G"
121+
},
122+
123+
"Ethernet240": {
124+
"default_brkout_mode": "1x400G"
125+
},
126+
127+
"Ethernet248": {
128+
"default_brkout_mode": "1x400G"
129+
},
130+
131+
"Ethernet256": {
132+
"default_brkout_mode": "1x10G"
133+
},
134+
135+
"Ethernet257": {
136+
"default_brkout_mode": "1x10G"
137+
}
138+
}
139+
}
140+

‎device/ufispace/x86_64-ufispace_s9300_32d-r0/UFISPACE-S9300-32D/port_config.ini

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# name lanes alias index speed
2+
Ethernet0 1,2,3,4,5,6,7,8 Ethernet1/1 0 400000
3+
Ethernet8 9,10,11,12,13,14,15,16 Ethernet2/1 1 400000
4+
Ethernet16 17,18,19,20,21,22,23,24 Ethernet3/1 2 400000
5+
Ethernet24 25,26,27,28,29,30,31,32 Ethernet4/1 3 400000
6+
Ethernet32 33,34,35,36,37,38,39,40 Ethernet5/1 4 400000
7+
Ethernet40 41,42,43,44,45,46,47,48 Ethernet6/1 5 400000
8+
Ethernet48 49,50,51,52,53,54,55,56 Ethernet7/1 6 400000
9+
Ethernet56 57,58,59,60,61,62,63,64 Ethernet8/1 7 400000
10+
Ethernet64 65,66,67,68,69,70,71,72 Ethernet9/1 8 400000
11+
Ethernet72 73,74,75,76,77,78,79,80 Ethernet10/1 9 400000
12+
Ethernet80 81,82,83,84,85,86,87,88 Ethernet11/1 10 400000
13+
Ethernet88 89,90,91,92,93,94,95,96 Ethernet12/1 11 400000
14+
Ethernet96 97,98,99,100,101,102,103,104 Ethernet13/1 12 400000
15+
Ethernet104 105,106,107,108,109,110,111,112 Ethernet14/1 13 400000
16+
Ethernet112 113,114,115,116,117,118,119,120 Ethernet15/1 14 400000
17+
Ethernet120 121,122,123,124,125,126,127,128 Ethernet16/1 15 400000
18+
Ethernet128 129,130,131,132,133,134,135,136 Ethernet17/1 16 400000
19+
Ethernet136 137,138,139,140,141,142,143,144 Ethernet18/1 17 400000
20+
Ethernet144 145,146,147,148,149,150,151,152 Ethernet19/1 18 400000
21+
Ethernet152 153,154,155,156,157,158,159,160 Ethernet20/1 19 400000
22+
Ethernet160 161,162,163,164,165,166,167,168 Ethernet21/1 20 400000
23+
Ethernet168 169,170,171,172,173,174,175,176 Ethernet22/1 21 400000
24+
Ethernet176 177,178,179,180,181,182,183,184 Ethernet23/1 22 400000
25+
Ethernet184 185,186,187,188,189,190,191,192 Ethernet24/1 23 400000
26+
Ethernet192 193,194,195,196,197,198,199,200 Ethernet25/1 24 400000
27+
Ethernet200 201,202,203,204,205,206,207,208 Ethernet26/1 25 400000
28+
Ethernet208 209,210,211,212,213,214,215,216 Ethernet27/1 26 400000
29+
Ethernet216 217,218,219,220,221,222,223,224 Ethernet28/1 27 400000
30+
Ethernet224 225,226,227,228,229,230,231,232 Ethernet29/1 28 400000
31+
Ethernet232 233,234,235,236,237,238,239,240 Ethernet30/1 29 400000
32+
Ethernet240 241,242,243,244,245,246,247,248 Ethernet31/1 30 400000
33+
Ethernet248 249,250,251,252,253,254,255,256 Ethernet32/1 31 400000
34+
Ethernet256 257 Ethernet33 32 10000
35+
Ethernet257 259 Ethernet34 33 10000

‎device/ufispace/x86_64-ufispace_s9300_32d-r0/UFISPACE-S9300-32D/sai.profile

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td4-s9300-32x400G.config.yml

0 commit comments

Comments
 (0)