Skip to content

Commit e0d3f0a

Browse files
vaibhavhdvaibhavhd
committed
Merge remote-tracking branch 'upstream/master' into config-init-flag
2 parents c05af46 + ddb3086 commit e0d3f0a

File tree

171 files changed

+17023
-174
lines changed

Some content is hidden

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

171 files changed

+17023
-174
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
@@ -115,3 +115,6 @@
115115
[submodule "src/dhcpmon"]
116116
path = src/dhcpmon
117117
url = https://github.com/sonic-net/sonic-dhcpmon.git
118+
[submodule "src/sonic-dash-api/sonic-dash-api"]
119+
path = src/sonic-dash-api/sonic-dash-api
120+
url = https://github.com/sonic-net/sonic-dash-api.git

‎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/netberg/x86_64-netberg_aurora_710-r0/aurora-710/buffers.json.j2

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{%- set default_topo = 't0' %}
2+
{%- include 'buffers_config.j2' %}

‎device/netberg/x86_64-netberg_aurora_710-r0/aurora-710/buffers_defaults_t0.j2

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
{% set default_cable = '5m' %}
2+
{% set ingress_lossless_pool_size = '4194304' %}
3+
{% set ingress_lossy_pool_size = '7340032' %}
4+
{% set egress_lossless_pool_size = '16777152' %}
5+
{% set egress_lossy_pool_size = '7340032' %}
6+
7+
{%- macro generate_port_lists(PORT_ALL) %}
8+
{# Generate list of ports #}
9+
{%- for port_idx in range(0,47) %}
10+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
11+
{%- endfor %}
12+
{% for port_idx in range(48,55) %}
13+
{% if PORT.append("Ethernet%d" % (48 + ( port_idx - 48 )*4)) %}{% endif %}
14+
{% endfor %}
15+
{%- endmacro %}
16+
17+
{%- macro generate_buffer_pool_and_profiles() %}
18+
"BUFFER_POOL": {
19+
"ingress_lossless_pool": {
20+
"size": "{{ ingress_lossless_pool_size }}",
21+
"type": "ingress",
22+
"mode": "dynamic"
23+
},
24+
"ingress_lossy_pool": {
25+
"size": "{{ ingress_lossy_pool_size }}",
26+
"type": "ingress",
27+
"mode": "dynamic"
28+
},
29+
"egress_lossless_pool": {
30+
"size": "{{ egress_lossless_pool_size }}",
31+
"type": "egress",
32+
"mode": "dynamic"
33+
},
34+
"egress_lossy_pool": {
35+
"size": "{{ egress_lossy_pool_size }}",
36+
"type": "egress",
37+
"mode": "dynamic"
38+
}
39+
},
40+
"BUFFER_PROFILE": {
41+
"ingress_lossless_profile": {
42+
"pool":"ingress_lossless_pool",
43+
"size":"4096",
44+
"dynamic_th":"0",
45+
"xon":"18432",
46+
"xoff":"18432"
47+
},
48+
"ingress_lossy_profile": {
49+
"pool":"ingress_lossy_pool",
50+
"size":"4096",
51+
"dynamic_th":"3"
52+
},
53+
"egress_lossless_profile": {
54+
"pool":"egress_lossless_pool",
55+
"size":"4096",
56+
"dynamic_th":"7",
57+
"xon":"18432",
58+
"xoff":"18432"
59+
},
60+
"egress_lossy_profile": {
61+
"pool":"egress_lossy_pool",
62+
"size":"4096",
63+
"dynamic_th":"3"
64+
},
65+
"q_lossy_profile": {
66+
"pool":"egress_lossy_pool",
67+
"size":"4096",
68+
"dynamic_th":"3"
69+
}
70+
},
71+
{%- endmacro %}
72+
73+
{%- macro generate_queue_buffers(port_names) %}
74+
"BUFFER_QUEUE": {
75+
{% for port in port_names.split(',') %}
76+
"{{ port }}|0-2": {
77+
"profile" : "q_lossy_profile"
78+
},
79+
{% endfor %}
80+
{% for port in port_names.split(',') %}
81+
"{{ port }}|3-4": {
82+
"profile" : "egress_lossless_profile"
83+
}{% if not loop.last %},{% endif %}
84+
{% endfor %}
85+
}
86+
{%- endmacro %}

‎device/netberg/x86_64-netberg_aurora_710-r0/aurora-710/buffers_defaults_t1.j2

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
{% set default_cable = '5m' %}
2+
{% set ingress_lossless_pool_size = '2097152' %}
3+
{% set ingress_lossy_pool_size = '5242880' %}
4+
{% set egress_lossless_pool_size = '16777152' %}
5+
{% set egress_lossy_pool_size = '5242880' %}
6+
7+
{%- macro generate_port_lists(PORT_ALL) %}
8+
{# Generate list of ports #}
9+
{%- for port_idx in range(0,47) %}
10+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
11+
{%- endfor %}
12+
{% for port_idx in range(48,55) %}
13+
{% if PORT.append("Ethernet%d" % (48+(port_idx-48)*4)) %}{% endif %}
14+
{% endfor %}
15+
{%- endmacro %}
16+
17+
{%- macro generate_buffer_pool_and_profiles() %}
18+
"BUFFER_POOL": {
19+
"ingress_lossless_pool": {
20+
"size": "{{ ingress_lossless_pool_size }}",
21+
"type": "ingress",
22+
"mode": "dynamic"
23+
},
24+
"ingress_lossy_pool": {
25+
"size": "{{ ingress_lossy_pool_size }}",
26+
"type": "ingress",
27+
"mode": "dynamic"
28+
},
29+
"egress_lossless_pool": {
30+
"size": "{{ egress_lossless_pool_size }}",
31+
"type": "egress",
32+
"mode": "dynamic"
33+
},
34+
"egress_lossy_pool": {
35+
"size": "{{ egress_lossy_pool_size }}",
36+
"type": "egress",
37+
"mode": "dynamic"
38+
}
39+
},
40+
"BUFFER_PROFILE": {
41+
"ingress_lossless_profile": {
42+
"pool":"ingress_lossless_pool",
43+
"size":"4096",
44+
"dynamic_th":"0",
45+
"xon":"18432",
46+
"xoff":"18432"
47+
},
48+
"ingress_lossy_profile": {
49+
"pool":"ingress_lossy_pool",
50+
"size":"4096",
51+
"dynamic_th":"3"
52+
},
53+
"egress_lossless_profile": {
54+
"pool":"egress_lossless_pool",
55+
"size":"4096",
56+
"dynamic_th":"7",
57+
"xon":"18432",
58+
"xoff":"18432"
59+
},
60+
"egress_lossy_profile": {
61+
"pool":"egress_lossy_pool",
62+
"size":"4096",
63+
"dynamic_th":"3"
64+
},
65+
"q_lossy_profile": {
66+
"pool":"egress_lossy_pool",
67+
"size":"4096",
68+
"dynamic_th":"3"
69+
}
70+
},
71+
{%- endmacro %}
72+
73+
{%- macro generate_queue_buffers(port_names) %}
74+
"BUFFER_QUEUE": {
75+
{% for port in port_names.split(',') %}
76+
"{{ port }}|0-2": {
77+
"profile" : "q_lossy_profile"
78+
},
79+
{% endfor %}
80+
{% for port in port_names.split(',') %}
81+
"{{ port }}|3-4": {
82+
"profile" : "egress_lossless_profile"
83+
}{% if not loop.last %},{% endif %}
84+
{% endfor %}
85+
}
86+
{%- endmacro %}

0 commit comments

Comments
 (0)