Skip to content

Commit 80a6699

Browse files
stepanblyschakstepanblyschak
committed
Merge branch 'master' of github.com:azure/sonic-buildimage into stop-action-kill-on-wb
2 parents 4012dab + 0191300 commit 80a6699

File tree

155 files changed

+23195
-1604
lines changed

Some content is hidden

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

155 files changed

+23195
-1604
lines changed

‎.azure-pipelines/azure-pipelines-UpgrateVersion.yml

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ parameters:
3838
- centec
3939
- centec-arm64
4040
- generic
41-
- innovium
4241
- marvell-armhf
4342
- mellanox
4443

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

+2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
swi_image: yes
5151

5252
- name: broadcom
53+
timeoutInMinutes: 1440
5354
variables:
5455
dbg_image: yes
5556
swi_image: yes
@@ -131,3 +132,4 @@ jobs:
131132
make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).bin
132133
fi
133134
displayName: "Build sonic image"
135+
- template: check-dirty-version.yml

‎.azure-pipelines/check-dirty-version.yml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
steps:
2+
- script: |
3+
. functions.sh
4+
SONIC_VERSION=$(sonic_get_version)
5+
echo "SONIC_VERSION=$SONIC_VERSION"
6+
if [[ "$SONIC_VERSION" == *dirty* ]]; then
7+
# Print the detail dirty info
8+
git status --untracked-files=no -s --ignore-submodules
9+
10+
# Exit with error, if it is a PR build
11+
if [ "$(Build.Reason)" == "PullRequest" ]; then
12+
echo "Build failed for the dirty version: $SONIC_VERSION" 1>&2
13+
exit 1
14+
fi
15+
fi
16+
displayName: "Check the dirty version"

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

+8-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
4141
- template: template-clean-sonic-slave.yml
4242
- ${{ else }}:
43-
- template: .azure-pipelines/template-variables.yml@buildimage
43+
- template: '/.azure-pipelines/template-clean-sonic-slave.yml@buildimage'
4444
- checkout: self
4545
clean: true
4646
submodules: recursive
@@ -101,9 +101,13 @@ jobs:
101101
containerRegistry: ${{ parameters.registry_conn }}
102102
repository: $(VARIABLE_SLAVE_BASE_IMAGE)
103103
command: push
104-
tags: |
105-
$(VARIABLE_SLAVE_BASE_TAG)
106-
latest
104+
${{ if eq(variables['Build.SourceBranchName'], 'master') }}:
105+
tags: |
106+
$(VARIABLE_SLAVE_BASE_TAG)
107+
latest
108+
${{ else }}:
109+
tags: |
110+
$(VARIABLE_SLAVE_BASE_TAG)
107111
- ${{ if ne(parameters.arch, 'amd64') }}:
108112
- task: Docker@2
109113
condition: ne(variables['Build.Reason'], 'PullRequest')

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ stages:
6060
- ${{ each dist in parameters.dists }}:
6161
- ${{ if endswith(variables['Build.DefinitionName'], dist) }}:
6262
- ${{ each arch in parameters.arches }}:
63-
- ${{ if eq(variables['System.PullRequest.TargetBranch'], 'master') }}:
63+
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
6464
- template: docker-sonic-slave-template.yml
6565
parameters:
6666
pool: sonicbld
6767
arch: ${{ arch }}
6868
dist: ${{ dist }}
6969
- ${{ else }}:
70-
- template: .azure-pipelines/docker-sonic-slave-template.yml@buildimage
70+
- template: '/.azure-pipelines/docker-sonic-slave-template.yml@buildimage'
7171
parameters:
7272
pool: sonicbld
7373
arch: ${{ arch }}

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@
6262
[submodule "src/redis-dump-load"]
6363
path = src/redis-dump-load
6464
url = https://github.com/p/redis-dump-load.git
65+
[submodule "src/scapy"]
66+
path = src/scapy
67+
url = https://github.com/secdev/scapy.git
6568
[submodule "platform/mellanox/mlnx-sai/SAI-Implementation"]
6669
path = platform/mellanox/mlnx-sai/SAI-Implementation
6770
url = https://github.com/Mellanox/SAI-Implementation

‎build_debian.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'setup
447447
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'wheel==0.35.1'
448448

449449
# docker Python API package is needed by Ansible docker module as well as some SONiC applications
450-
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'docker==4.3.1'
450+
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'docker==5.0.3'
451451

452452
# Install scapy
453453
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'scapy==2.4.4'

‎device/accton/x86_64-accton_as9716_32d-r0/pddf/pddf-device.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@
5353
],
5454
"custom_kos":
5555
[
56-
"pddf_custom_psu"
56+
"pddf_custom_psu",
57+
"accton_as9716_32d_ioport"
5758
]
5859
},
5960

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2

-1
This file was deleted.

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../Arista-7050CX3-32S-D48C8/qos.json.j2

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ host_as_route_disable=1
55
use_all_splithorizon_groups=1
66
riot_enable=1
77
sai_tunnel_support=1
8+
sai_tunnel_underlay_route_mode=1
89
riot_overlay_l3_intf_mem_size=4096
910
riot_overlay_l3_egress_mem_size=32768
1011
l3_ecmp_levels=2

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2

+101
Original file line numberDiff line numberDiff line change
@@ -1 +1,102 @@
1+
{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %}
2+
{%- macro generate_dscp_to_tc_map() %}
3+
"DSCP_TO_TC_MAP": {
4+
"AZURE": {
5+
"0" : "1",
6+
"1" : "1",
7+
"2" : "1",
8+
"3" : "3",
9+
"4" : "4",
10+
"5" : "1",
11+
"6" : "1",
12+
"7" : "1",
13+
"8" : "0",
14+
"9" : "1",
15+
"10": "1",
16+
"11": "1",
17+
"12": "1",
18+
"13": "1",
19+
"14": "1",
20+
"15": "1",
21+
"16": "1",
22+
"17": "1",
23+
"18": "1",
24+
"19": "1",
25+
"20": "1",
26+
"21": "1",
27+
"22": "1",
28+
"23": "1",
29+
"24": "1",
30+
"25": "1",
31+
"26": "1",
32+
"27": "1",
33+
"28": "1",
34+
"29": "1",
35+
"30": "1",
36+
"31": "1",
37+
"32": "1",
38+
"33": "2",
39+
"34": "1",
40+
"35": "1",
41+
"36": "1",
42+
"37": "1",
43+
"38": "1",
44+
"39": "1",
45+
"40": "1",
46+
"41": "1",
47+
"42": "1",
48+
"43": "1",
49+
"44": "1",
50+
"45": "1",
51+
"46": "5",
52+
"47": "1",
53+
"48": "7",
54+
"49": "1",
55+
"50": "1",
56+
"51": "1",
57+
"52": "1",
58+
"53": "1",
59+
"54": "1",
60+
"55": "1",
61+
"56": "1",
62+
"57": "1",
63+
"58": "1",
64+
"59": "1",
65+
"60": "1",
66+
"61": "1",
67+
"62": "1",
68+
"63": "1"
69+
}
70+
},
71+
{%- endmacro %}
72+
{%- macro generate_tc_to_pg_map() %}
73+
"TC_TO_PRIORITY_GROUP_MAP": {
74+
"AZURE": {
75+
"0": "0",
76+
"1": "0",
77+
"2": "0",
78+
"3": "3",
79+
"4": "4",
80+
"5": "0",
81+
"6": "0",
82+
"7": "7"
83+
}
84+
},
85+
{%- endmacro %}
86+
{%- macro generate_tc_to_queue_map() %}
87+
"TC_TO_QUEUE_MAP": {
88+
"AZURE": {
89+
"0": "0",
90+
"1": "1",
91+
"2": "1",
92+
"3": "3",
93+
"4": "4",
94+
"5": "5",
95+
"6": "6",
96+
"7": "7"
97+
}
98+
},
99+
{%- endmacro %}
100+
{% endif %}
101+
1102
{%- include 'qos_config.j2' %}

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ host_as_route_disable=1
55
use_all_splithorizon_groups=1
66
riot_enable=1
77
sai_tunnel_support=1
8+
sai_tunnel_underlay_route_mode=1
89
riot_overlay_l3_intf_mem_size=4096
910
riot_overlay_l3_egress_mem_size=32768
1011
l3_ecmp_levels=2

‎device/arista/x86_64-arista_7050cx3_32s/td3-a7050cx3-32s-flex.config.bcm

+1
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@ robust_hash_disable_mpls=1
397397
robust_hash_disable_vlan=1
398398
sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_premium_issu/b870.6.4.1/
399399
sai_tunnel_support=1
400+
sai_tunnel_underlay_route_mode=1
400401
serdes_core_rx_polarity_flip_physical{1}=0x8
401402
serdes_core_rx_polarity_flip_physical{5}=0x2
402403
serdes_core_rx_polarity_flip_physical{9}=0xc

‎device/arista/x86_64-arista_7170_64c/Arista-7170-64C/buffers_defaults_t0.j2

+9-5
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,15 @@
6161

6262
{%- macro generate_queue_buffers(port_names) %}
6363
"BUFFER_QUEUE": {
64-
"{{ port_names }}|3-4": {
65-
"profile" : "egress_lossless_profile"
66-
},
67-
"{{ port_names }}|0-1": {
64+
{% for port in port_names.split(',') %}
65+
"{{ port }}|0-2": {
6866
"profile" : "q_lossy_profile"
69-
}
67+
},
68+
{% endfor %}
69+
{% for port in port_names.split(',') %}
70+
"{{ port }}|3-4": {
71+
"profile" : "egress_lossless_profile"
72+
}{% if not loop.last %},{% endif %}
73+
{% endfor %}
7074
}
7175
{%- endmacro %}

‎device/arista/x86_64-arista_7170_64c/Arista-7170-64C/buffers_defaults_t1.j2

+9-5
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,15 @@
6161

6262
{%- macro generate_queue_buffers(port_names) %}
6363
"BUFFER_QUEUE": {
64-
"{{ port_names }}|3-4": {
65-
"profile" : "egress_lossless_profile"
66-
},
67-
"{{ port_names }}|0-1": {
64+
{% for port in port_names.split(',') %}
65+
"{{ port }}|0-2": {
6866
"profile" : "q_lossy_profile"
69-
}
67+
},
68+
{% endfor %}
69+
{% for port in port_names.split(',') %}
70+
"{{ port }}|3-4": {
71+
"profile" : "egress_lossless_profile"
72+
}{% if not loop.last %},{% endif %}
73+
{% endfor %}
7074
}
7175
{%- endmacro %}

‎device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
{%- set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
1313
{%- if 'dualtor' in switch_subtype.lower() %}
1414
{%- set IPinIP_sock = 'sai_tunnel_support=1
15+
sai_tunnel_underlay_route_mode=1
1516
host_as_route_disable=1
1617
l3_ecmp_levels=2' -%}
1718
{%- endif %}

0 commit comments

Comments
 (0)