Skip to content

Commit 42cd9c0

Browse files
neethajohnneethajohn
committed
Merged PR 7186175: Manual merge from github/master to internal
Resolved merge conflicts in the following files manually device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/buffers_defaults_t0.j2 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/buffers_defaults_t1.j2 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2 src/sonic-config-engine/tests/test_j2files.py Related work items: sonic-net#11864, sonic-net#12585, sonic-net#12607, sonic-net#12619, sonic-net#12626, sonic-net#12707, sonic-net#12714, sonic-net#12729, sonic-net#12733, sonic-net#12736, sonic-net#12750, sonic-net#12751, sonic-net#12755, sonic-net#12757, sonic-net#12758, sonic-net#12760, sonic-net#12761, sonic-net#12769, sonic-net#12783
2 parents f270115 + 6dc3e55 commit 42cd9c0

File tree

131 files changed

+1290
-1510
lines changed

Some content is hidden

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

131 files changed

+1290
-1510
lines changed

‎README.buildsystem.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ You might find **rules/config** very useful, as it is a configuration file for a
5555
**dockers/** directory is a place where you can find Dockerfiles for generic docker images.
5656
**src/** is a place where a source code for generic packages goes.
5757
It has both submodules (simple case, just run dpkg-buildpackage to build),
58-
and directories with more complcated components, that provide their own Makefiles.
58+
and directories with more complicated components, that provide their own Makefiles.
5959
**platform/** contains all vendor-specific recipes, submodules etc.
6060
Every **platform/[VENDOR]/** directory is a derived part of buildimage frontend, that defines rules and targets for a concrete vendor.
6161

@@ -119,7 +119,7 @@ SONIC_PYTHON_STDEB_DEBS += $(SOME_NEW_DEB) # add package to this target group
119119
120120
**SONIC_MAKE_DEBS**
121121
This is a bit more flexible case.
122-
If you have to do some specific type of build or apply pathes prior to build, just define your own Makefile and add it to buildimage.
122+
If you have to do some specific type of build or apply paths prior to build, just define your own Makefile and add it to buildimage.
123123
Define:
124124
```make
125125
SOME_NEW_DEB = some_new_deb.deb # name of your package
@@ -178,7 +178,7 @@ SONIC_SIMPLE_DOCKER_IMAGES += $(SOME_DOCKER) # add docker to this group
178178
```
179179
180180
**SONIC_DOCKER_IMAGES**
181-
This one is a bit more sophisticated. You can define debian packages from buildimage that will be installed to it, and corresponding Dockerfile will be dinamically generated from a template.
181+
This one is a bit more sophisticated. You can define debian packages from buildimage that will be installed to it, and corresponding Dockerfile will be dynamically generated from a template.
182182
Define:
183183
```make
184184
SOME_DOCKER = some_docker.gz # name of your docker

‎README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,11 @@ sudo pip3 install j2cli
102102
* Add current user to the docker group: `sudo gpasswd -a ${USER} docker`
103103
* Log out and log back in so that your group membership is re-evaluated
104104

105-
## Clone or fetch the code repository with all git submodules
106-
To clone the code repository recursively, assuming git version 1.9 or newer:
105+
## Clone the repository with all the git submodules
107106

108-
git clone https://github.com/sonic-net/sonic-buildimage.git
107+
To clone the code repository recursively:
108+
109+
git clone --recurse-submodules https://github.com/sonic-net/sonic-buildimage.git
109110

110111
## Usage
111112

‎azure-pipelines.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,3 +364,18 @@ stages:
364364
COMMON_EXTRA_PARAMS: "--neighbor_type=sonic --enable_macsec --macsec_profile=128_SCI,256_XPN_SCI"
365365
VM_TYPE: vsonic
366366
SPECIFIED_PARAMS: '{\"test_pretest.py\":[\"--completeness_level=confident\",\"--allow_recover\"],\"test_posttest.py\":[\"--completeness_level=confident\",\"--allow_recover\"]}'
367+
368+
- job: wan_testbedv2
369+
displayName: "kvmtest-wan by TestbedV2"
370+
pool:
371+
vmImage: 'ubuntu-20.04'
372+
timeoutInMinutes: 1080
373+
condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES'))
374+
continueOnError: true
375+
steps:
376+
- template: .azure-pipelines/run-test-scheduler-template.yml
377+
parameters:
378+
TOPOLOGY: wan-pub
379+
MIN_WORKER: 1
380+
MAX_WORKER: 1
381+
COMMON_EXTRA_PARAMS: "--skip_sanity "

‎build_debian.sh

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT mount
110110
## Pointing apt to public apt mirrors and getting latest packages, needed for latest security updates
111111
scripts/build_mirror_config.sh files/apt $CONFIGURED_ARCH $IMAGE_DISTRO
112112
sudo cp files/apt/sources.list.$CONFIGURED_ARCH $FILESYSTEM_ROOT/etc/apt/sources.list
113-
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/
113+
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/
114114

115115
## Note: set lang to prevent locale warnings in your chroot
116116
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y update
@@ -481,16 +481,12 @@ rm /files/etc/ssh/sshd_config/ClientAliveInterval
481481
rm /files/etc/ssh/sshd_config/ClientAliveCountMax
482482
touch /files/etc/ssh/sshd_config/EmptyLineHack
483483
rename /files/etc/ssh/sshd_config/EmptyLineHack ""
484-
set /files/etc/ssh/sshd_config/ClientAliveInterval 300
484+
set /files/etc/ssh/sshd_config/ClientAliveInterval 900
485485
set /files/etc/ssh/sshd_config/ClientAliveCountMax 0
486486
ins #comment before /files/etc/ssh/sshd_config/ClientAliveInterval
487-
set /files/etc/ssh/sshd_config/#comment[following-sibling::*[1][self::ClientAliveInterval]] "Close inactive client sessions after 5 minutes"
488-
rm /files/etc/ssh/sshd_config/MaxAuthTries
489-
set /files/etc/ssh/sshd_config/MaxAuthTries 3
487+
set /files/etc/ssh/sshd_config/#comment[following-sibling::*[1][self::ClientAliveInterval]] "Close inactive client sessions after 15 minutes"
490488
rm /files/etc/ssh/sshd_config/LogLevel
491489
set /files/etc/ssh/sshd_config/LogLevel VERBOSE
492-
rm /files/etc/ssh/sshd_config/Banner
493-
set /files/etc/ssh/sshd_config/Banner /etc/issue
494490
save
495491
quit
496492
EOF

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/BALANCED

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../common/profiles/td2/gen/BALANCED

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/RDMA-CENTRIC

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../common/profiles/td2/gen/RDMA-CENTRIC

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/TCP-CENTRIC

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../common/profiles/td2/gen/TCP-CENTRIC

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/buffer_ports_t0.j2

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{%- macro generate_port_lists(PORT_ALL) %}
2+
{# Generate list of ports #}
3+
{% for port_idx in range(0,32) %}
4+
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
5+
{% endfor %}
6+
{%- endmacro %}

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/buffer_ports_t1.j2

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{%- macro generate_port_lists(PORT_ALL) %}
2+
{# Generate list of ports #}
3+
{% for port_idx in range(0,32) %}
4+
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
5+
{% endfor %}
6+
{%- endmacro %}

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/buffers_defaults_t0.j2

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/buffers_defaults_t0.j2

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

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/buffers_defaults_t1.j2

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/buffers_defaults_t1.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
BALANCED/buffers_defaults_t1.j2

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/pg_profile_lookup.ini

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/pg_profile_lookup.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
BALANCED/pg_profile_lookup.ini

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/qos.json.j2

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/qos.json.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
BALANCED/qos.json.j2

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/BALANCED

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../common/profiles/td2/gen/BALANCED

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/RDMA-CENTRIC

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../common/profiles/td2/gen/RDMA-CENTRIC

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/TCP-CENTRIC

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../common/profiles/td2/gen/TCP-CENTRIC

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffer_ports_t0.j2

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{%- macro generate_port_lists(PORT_ALL) %}
2+
{# Generate list of ports #}
3+
{% for port_idx in range(0,32) %}
4+
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
5+
{% endfor %}
6+
{%- endmacro %}

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffer_ports_t1.j2

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{%- macro generate_port_lists(PORT_ALL) %}
2+
{# Generate list of ports #}
3+
{% for port_idx in range(0,32) %}
4+
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
5+
{% endfor %}
6+
{%- endmacro %}

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2

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

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
BALANCED/buffers_defaults_t1.j2

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/pg_profile_lookup.ini

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/pg_profile_lookup.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
BALANCED/pg_profile_lookup.ini

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
BALANCED/qos.json.j2

‎device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/BALANCED

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../common/profiles/td2/gen/BALANCED

‎device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/RDMA-CENTRIC

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../common/profiles/td2/gen/RDMA-CENTRIC

‎device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/TCP-CENTRIC

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../common/profiles/td2/gen/TCP-CENTRIC

0 commit comments

Comments
 (0)