Skip to content

Commit ced57e2

Browse files
abdosiabdosi
committed
Merge remote-tracking branch 'upstream/master' into chassis
2 parents 2109e03 + f6285bd commit ced57e2

File tree

249 files changed

+6213
-790
lines changed

Some content is hidden

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

249 files changed

+6213
-790
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ jobs:
3535
dbg_image: no
3636
asan_image: no
3737
swi_image: no
38-
raw_image: no
3938
docker_syncd_rpc_image: no
4039
syncd_rpc_image: no
4140
platform_rpc: no
@@ -62,7 +61,6 @@ jobs:
6261
variables:
6362
dbg_image: yes
6463
swi_image: yes
65-
raw_image: yes
6664
docker_syncd_rpc_image: yes
6765
platform_rpc: brcm
6866

@@ -149,9 +147,6 @@ jobs:
149147
if [ $(swi_image) == yes ]; then
150148
make $BUILD_OPTIONS ENABLE_IMAGE_SIGNATURE=y target/sonic-aboot-$(GROUP_NAME).swi
151149
fi
152-
if [ $(raw_image) == yes ]; then
153-
make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).raw
154-
fi
155150
if [ $(docker_syncd_rpc_image) == yes ]; then
156151
# workaround for issue in rules/sairedis.dep, git ls-files will list un-exist files for cache
157152
make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y target/docker-syncd-$(platform_rpc)-rpc.gz

‎.azure-pipelines/build-template.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,6 @@ jobs:
101101
if [ ${{ parameters.swi_image }} == true ]; then
102102
make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) ENABLE_IMAGE_SIGNATURE=y target/sonic-aboot-${{ parameters.platform }}.swi
103103
fi
104-
if [ ${{ parameters.raw_image }} == true ]; then
105-
make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) target/sonic-${{ parameters.platform }}.raw
106-
fi
107104
if [ ${{ parameters.sync_rpc_image }} == true ]; then
108105
make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) ENABLE_SYNCD_RPC=y target/docker-syncd-${{ parameters.platform_short }}-rpc.gz
109106
# workaround for issue in rules/sairedis.dep, git ls-files will list un-exist files for cache

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ stages:
3939
- name: broadcom
4040
variables:
4141
swi_image: yes
42-
raw_image: yes
4342
docker_syncd_rpc_image: yes
4443
platform_rpc: brcm
4544
- name: mellanox

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,3 +105,6 @@ htmlcov/
105105
# Debian mirror Sources
106106
sources.list.*
107107
!sources.list*.j2
108+
109+
# Generated mirror configs
110+
apt-retries-count

‎Makefile.work

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,7 @@ SONIC_BUILD_INSTRUCTION := $(MAKE) \
537537
SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD=$(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD) \
538538
SONIC_INCLUDE_SYSTEM_TELEMETRY=$(INCLUDE_SYSTEM_TELEMETRY) \
539539
INCLUDE_DHCP_RELAY=$(INCLUDE_DHCP_RELAY) \
540+
INCLUDE_DHCP_SERVER=$(INCLUDE_DHCP_SERVER) \
540541
INCLUDE_MACSEC=$(INCLUDE_MACSEC) \
541542
SONIC_INCLUDE_RESTAPI=$(INCLUDE_RESTAPI) \
542543
SONIC_INCLUDE_MUX=$(INCLUDE_MUX) \

‎README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,10 @@ on the SAI version for each SONiC release.
353353
[managing, configuring and monitoring SONiC](https://github.com/sonic-net/sonic-mgmt)
354354
(gzip tar archive)
355355

356+
## SONiC Image Azure Pipelines
357+
358+
All SONiC project build pipeline could be found at [Download Portal for SONiC Images](https://sonic-build.azurewebsites.net)
359+
356360
## Contribution Guide
357361

358362
All contributors must sign a contribution license agreement before contributions

‎azure-pipelines.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,16 @@ stages:
116116
artifact: sonic-buildimage.vs
117117
displayName: "Download sonic-buildimage.vs artifact"
118118

119+
- script: |
120+
sudo src/sonic-swss-common/.azure-pipelines/build_and_install_module.sh
121+
displayName: "Install kernel modules"
122+
119123
- script: |
120124
sudo apt-get update
121125
sudo apt-get install -y make libtool m4 autoconf dh-exec debhelper cmake pkg-config \
122-
libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libnl-nf-3-dev swig3.0 \
126+
libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libnl-nf-3-dev swig \
123127
libpython2.7-dev libboost-dev libboost-serialization-dev uuid-dev libzmq5 libzmq3-dev python3-pip \
124-
cmake libgtest-dev libgmock-dev libyang-dev
128+
cmake libgtest-dev libgmock-dev libyang-dev nlohmann-json3-dev
125129
sudo pip3 install pytest
126130
cd src/sonic-swss-common
127131
./autogen.sh

‎build_debian.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
3333
## docker engine version (with platform)
3434
DOCKER_VERSION=5:24.0.2-1~debian.11~$IMAGE_DISTRO
3535
CONTAINERD_IO_VERSION=1.6.21-1
36-
LINUX_KERNEL_VERSION=5.10.0-18-2
36+
LINUX_KERNEL_VERSION=5.10.0-23-2
3737

3838
## Working directory to prepare the file system
3939
FILESYSTEM_ROOT=./fsroot
@@ -113,7 +113,8 @@ sudo LANG=C chroot $FILESYSTEM_ROOT mount
113113
## Pointing apt to public apt mirrors and getting latest packages, needed for latest security updates
114114
scripts/build_mirror_config.sh files/apt $CONFIGURED_ARCH $IMAGE_DISTRO
115115
sudo cp files/apt/sources.list.$CONFIGURED_ARCH $FILESYSTEM_ROOT/etc/apt/sources.list
116-
sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages},no-check-valid-until,apt-multiple-retries} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
116+
sudo cp files/apt/apt-retries-count $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
117+
sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages},no-check-valid-until} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
117118

118119
## Note: set lang to prevent locale warnings in your chroot
119120
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y update
@@ -407,6 +408,10 @@ LogsDirectory=audit
407408
LogsDirectoryMode=0750
408409
EOF
409410

411+
# latest tcpdump control resource access with AppArmor.
412+
# override tcpdump profile to allow tcpdump access TACACS config file.
413+
sudo cp files/apparmor/usr.bin.tcpdump $FILESYSTEM_ROOT/etc/apparmor.d/local/usr.bin.tcpdump
414+
410415
if [[ $CONFIGURED_ARCH == amd64 ]]; then
411416
## Pre-install the fundamental packages for amd64 (x86)
412417
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install \

‎device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32-200Gx48-100Gx32/hwsku.json

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
{
2+
"interfaces": {
3+
"Ethernet0": {
4+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
5+
},
6+
"Ethernet8": {
7+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
8+
},
9+
"Ethernet16": {
10+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
11+
},
12+
"Ethernet24": {
13+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
14+
},
15+
"Ethernet32": {
16+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
17+
},
18+
"Ethernet40": {
19+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
20+
},
21+
"Ethernet48": {
22+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
23+
},
24+
"Ethernet56": {
25+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
26+
},
27+
"Ethernet64": {
28+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
29+
},
30+
"Ethernet72": {
31+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
32+
},
33+
"Ethernet80": {
34+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
35+
},
36+
"Ethernet88": {
37+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
38+
},
39+
"Ethernet96": {
40+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
41+
},
42+
"Ethernet104": {
43+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
44+
},
45+
"Ethernet112": {
46+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
47+
},
48+
"Ethernet120": {
49+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
50+
},
51+
"Ethernet128": {
52+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
53+
},
54+
"Ethernet136": {
55+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
56+
},
57+
"Ethernet144": {
58+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
59+
},
60+
"Ethernet152": {
61+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
62+
},
63+
"Ethernet160": {
64+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
65+
},
66+
"Ethernet168": {
67+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
68+
},
69+
"Ethernet176": {
70+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
71+
},
72+
"Ethernet184": {
73+
"default_brkout_mode": "2x200G[100G,50G,40G,25G,10G]"
74+
},
75+
"Ethernet192": {
76+
"default_brkout_mode": "4x100G[50G,40G,25G,10G]"
77+
},
78+
"Ethernet200": {
79+
"default_brkout_mode": "4x100G[50G,40G,25G,10G]"
80+
},
81+
"Ethernet208": {
82+
"default_brkout_mode": "4x100G[50G,40G,25G,10G]"
83+
},
84+
"Ethernet216": {
85+
"default_brkout_mode": "4x100G[50G,40G,25G,10G]"
86+
},
87+
"Ethernet224": {
88+
"default_brkout_mode": "4x100G[50G,40G,25G,10G]"
89+
},
90+
"Ethernet232": {
91+
"default_brkout_mode": "4x100G[50G,40G,25G,10G]"
92+
},
93+
"Ethernet240": {
94+
"default_brkout_mode": "4x100G[50G,40G,25G,10G]"
95+
},
96+
"Ethernet248": {
97+
"default_brkout_mode": "4x100G[50G,40G,25G,10G]"
98+
},
99+
"Ethernet256": {
100+
"default_brkout_mode": "1x10G",
101+
"fec": "none"
102+
}
103+
}
104+
}

‎device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32-200Gx48-100Gx32/sai.profile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th4-a7060dx5-32-200Gx48-100Gx32.config.bcm

0 commit comments

Comments
 (0)