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

README.buildsystem.md

@@ -55,7 +55,7 @@ You might find **rules/config** very useful, as it is a configuration file for a
 **dockers/** directory is a place where you can find Dockerfiles for generic docker images.  
 **src/** is a place where a source code for generic packages goes.
 It has both submodules (simple case, just run dpkg-buildpackage to build),
-and directories with more complcated components, that provide their own Makefiles.  
+and directories with more complicated components, that provide their own Makefiles.
 **platform/** contains all vendor-specific recipes, submodules etc.  
 Every **platform/[VENDOR]/** directory is a derived part of buildimage frontend, that defines rules and targets for a concrete vendor.  
 
@@ -119,7 +119,7 @@ SONIC_PYTHON_STDEB_DEBS += $(SOME_NEW_DEB) # add package to this target group
 
 **SONIC_MAKE_DEBS**  
 This is a bit more flexible case.
-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.
+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.
 Define:
 ```make
 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
 ```
 
 **SONIC_DOCKER_IMAGES**  
-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.
+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.
 Define:  
 ```make
 SOME_DOCKER = some_docker.gz # name of your docker

README.md

@@ -102,10 +102,11 @@ sudo pip3 install j2cli
     * Add current user to the docker group: `sudo gpasswd -a ${USER} docker`
     * Log out and log back in so that your group membership is re-evaluated
 
-## Clone or fetch the code repository with all git submodules
-To clone the code repository recursively, assuming git version 1.9 or newer:
+## Clone the repository with all the git submodules
 
-    git clone https://github.com/sonic-net/sonic-buildimage.git
+To clone the code repository recursively:
+
+    git clone --recurse-submodules https://github.com/sonic-net/sonic-buildimage.git
 
 ## Usage
 

azure-pipelines.yml

@@ -364,3 +364,18 @@ stages:
           COMMON_EXTRA_PARAMS: "--neighbor_type=sonic --enable_macsec --macsec_profile=128_SCI,256_XPN_SCI"
           VM_TYPE: vsonic
           SPECIFIED_PARAMS: '{\"test_pretest.py\":[\"--completeness_level=confident\",\"--allow_recover\"],\"test_posttest.py\":[\"--completeness_level=confident\",\"--allow_recover\"]}'
+
+  - job: wan_testbedv2
+    displayName: "kvmtest-wan by TestbedV2"
+    pool:
+      vmImage: 'ubuntu-20.04'
+    timeoutInMinutes: 1080
+    condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES'))
+    continueOnError: true
+    steps:
+      - template: .azure-pipelines/run-test-scheduler-template.yml
+        parameters:
+          TOPOLOGY: wan-pub
+          MIN_WORKER: 1
+          MAX_WORKER: 1
+          COMMON_EXTRA_PARAMS: "--skip_sanity "

build_debian.sh

@@ -110,7 +110,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT mount
 ## Pointing apt to public apt mirrors and getting latest packages, needed for latest security updates
 scripts/build_mirror_config.sh files/apt $CONFIGURED_ARCH $IMAGE_DISTRO 
 sudo cp files/apt/sources.list.$CONFIGURED_ARCH $FILESYSTEM_ROOT/etc/apt/sources.list
-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/
+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/
 
 ## Note: set lang to prevent locale warnings in your chroot
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y update
@@ -481,16 +481,12 @@ rm /files/etc/ssh/sshd_config/ClientAliveInterval
 rm /files/etc/ssh/sshd_config/ClientAliveCountMax
 touch /files/etc/ssh/sshd_config/EmptyLineHack
 rename /files/etc/ssh/sshd_config/EmptyLineHack ""
-set /files/etc/ssh/sshd_config/ClientAliveInterval 300
+set /files/etc/ssh/sshd_config/ClientAliveInterval 900
 set /files/etc/ssh/sshd_config/ClientAliveCountMax 0
 ins #comment before /files/etc/ssh/sshd_config/ClientAliveInterval
-set /files/etc/ssh/sshd_config/#comment[following-sibling::*[1][self::ClientAliveInterval]] "Close inactive client sessions after 5 minutes"
-rm /files/etc/ssh/sshd_config/MaxAuthTries
-set /files/etc/ssh/sshd_config/MaxAuthTries 3
+set /files/etc/ssh/sshd_config/#comment[following-sibling::*[1][self::ClientAliveInterval]] "Close inactive client sessions after 15 minutes"
 rm /files/etc/ssh/sshd_config/LogLevel
 set /files/etc/ssh/sshd_config/LogLevel VERBOSE
-rm /files/etc/ssh/sshd_config/Banner
-set /files/etc/ssh/sshd_config/Banner /etc/issue
 save
 quit
 EOF

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

@@ -0,0 +1 @@
+../../../common/profiles/td2/gen/BALANCED

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

@@ -0,0 +1 @@
+../../../common/profiles/td2/gen/RDMA-CENTRIC

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

@@ -0,0 +1 @@
+../../../common/profiles/td2/gen/TCP-CENTRIC

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

@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}

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

@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}

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

@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2

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

@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2

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

@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini

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

@@ -0,0 +1 @@
+BALANCED/qos.json.j2

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

@@ -0,0 +1 @@
+../../../common/profiles/td2/gen/BALANCED

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

@@ -0,0 +1 @@
+../../../common/profiles/td2/gen/RDMA-CENTRIC

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

@@ -0,0 +1 @@
+../../../common/profiles/td2/gen/TCP-CENTRIC

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

@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}

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

@@ -0,0 +1,6 @@
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {% for port_idx in range(0,32) %}
+        {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
+    {% endfor %}
+{%- endmacro %}

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

@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t0.j2

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

@@ -0,0 +1 @@
+BALANCED/buffers_defaults_t1.j2

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

@@ -0,0 +1 @@
+BALANCED/pg_profile_lookup.ini

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

@@ -0,0 +1 @@
+BALANCED/qos.json.j2

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

@@ -0,0 +1 @@
+../../../common/profiles/td2/gen/BALANCED

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

@@ -0,0 +1 @@
+../../../common/profiles/td2/gen/RDMA-CENTRIC

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

@@ -0,0 +1 @@
+../../../common/profiles/td2/gen/TCP-CENTRIC