Junchao-Mellanox · Junchao-Mellanox · May 31, 2021 · Jun 10, 2021 · Jun 15, 2021 · Jun 10, 2021
diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
@@ -65,7 +65,7 @@ jobs:
 
         - name: centec-arm64
           pool: sonicbld_8c
-          timeoutInMinutes: 2160
+          timeoutInMinutes: 2880
           variables:
             PLATFORM_ARCH: arm64
 
@@ -79,7 +79,7 @@ jobs:
 
         - name: marvell-armhf
           pool: sonicbld_8c
-          timeoutInMinutes: 2160
+          timeoutInMinutes: 2880
           variables:
             PLATFORM_ARCH: armhf
 

diff --git a/.gitignore b/.gitignore
@@ -74,10 +74,17 @@ platform/broadcom/sonic-platform-modules-dell/s6100/modules/dell_s6100_lpc.c
 platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_ich.c
 platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_mailbox.c
 platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/ipmihelper.py
+platform/cisco-8000
 
 # buildinfo
 files/build/buildinfo
 files/build/tmp
 dockers/**/buildinfo
 platform/**/buildinfo
 sonic-slave*/**/buildinfo
+
+# pytest coverage files
+.coverage
+coverage.xml
+test-results.xml
+htmlcov/
diff --git a/Makefile b/Makefile
@@ -5,6 +5,27 @@ NOSTRETCH ?= 0
 NOBUSTER ?= 0
 NOBULLSEYE ?= 1
 
+ifeq ($(NOJESSIE),0)
+BUILD_JESSIE=1
+endif
+
+ifeq ($(NOSTRETCH),0)
+BUILD_STRETCH=1
+endif
+
+ifeq ($(NOBUSTER),0)
+BUILD_BUSTER=1
+endif
+
+ifeq ($(NOBULLSEYE),0)
+BUILD_BULLSEYE=1
+endif
+
+PLATFORM_PATH := platform/$(if $(PLATFORM),$(PLATFORM),$(CONFIGURED_PLATFORM))
+PLATFORM_CHECKOUT := platform/checkout
+PLATFORM_CHECKOUT_FILE := $(PLATFORM_CHECKOUT)/$(PLATFORM).ini
+PLATFORM_CHECKOUT_CMD := $(shell if [ -f $(PLATFORM_CHECKOUT_FILE) ]; then PLATFORM_PATH=$(PLATFORM_PATH) j2 $(PLATFORM_CHECKOUT)/template.j2 $(PLATFORM_CHECKOUT_FILE); fi)
+
 %::
 	@echo "+++ --- Making $@ --- +++"
 ifeq ($(NOJESSIE), 0)
@@ -42,20 +63,28 @@ init:
 	@echo "+++ Making $@ +++"
 	make -f Makefile.work $@
 
-clean configure reset showtag sonic-slave-build sonic-slave-bash :
+#
+# Function to invoke target $@ in Makefile.work with proper BLDENV
+#
+define make_work
 	@echo "+++ Making $@ +++"
-ifeq ($(NOJESSIE), 0)
-	make -f Makefile.work $@
-endif
-ifeq ($(NOSTRETCH), 0)
-	BLDENV=stretch make -f Makefile.work $@
-endif
-ifeq ($(NOBUSTER), 0)
-	BLDENV=buster make -f Makefile.work $@
-endif
-ifeq ($(NOBULLSEYE), 0)
-	BLDENV=bullseye make -f Makefile.work $@
-endif
+	$(if $(BUILD_JESSIE),make -f Makefile.work $@,)
+	$(if $(BUILD_STRETCH),BLDENV=stretch make -f Makefile.work $@,)
+	$(if $(BUILD_BUSTER),BLDENV=buster make -f Makefile.work $@,)
+	$(if $(BUILD_BULLSEYE),BLDENV=bullseye make -f Makefile.work $@,)
+endef
+
+.PHONY: $(PLATFORM_PATH)
+
+$(PLATFORM_PATH):
+	@echo "+++ Cheking $@ +++"
+	$(PLATFORM_CHECKOUT_CMD)
+
+configure : $(PLATFORM_PATH)
+	$(call make_work, $@)
+
+clean reset showtag sonic-slave-build sonic-slave-bash :
+	$(call make_work, $@)
 
 # Freeze the versions, see more detail options: scripts/versions_manager.py freeze -h
 freeze:

diff --git a/build_debian.sh b/build_debian.sh
@@ -472,11 +472,16 @@ fi
 
 ## Version file
 sudo mkdir -p $FILESYSTEM_ROOT/etc/sonic
+if [ -f files/image_config/sonic_release ]; then
+    sudo cp files/image_config/sonic_release $FILESYSTEM_ROOT/etc/sonic/
+fi
 export build_version="${SONIC_IMAGE_VERSION}"
 export debian_version="$(cat $FILESYSTEM_ROOT/etc/debian_version)"
 export kernel_version="${kversion}"
 export asic_type="${sonic_asic_platform}"
 export commit_id="$(git rev-parse --short HEAD)"
+export branch="$(git rev-parse --abbrev-ref HEAD)"
+export release="$(if [ -f $FILESYSTEM_ROOT/etc/sonic/sonic_release ]; then cat $FILESYSTEM_ROOT/etc/sonic/sonic_release; fi)"
 export build_date="$(date -u)"
 export build_number="${BUILD_NUMBER:-0}"
 export built_by="$USER@$BUILD_HOSTNAME"

diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/pg_profile_lookup.ini
@@ -1,17 +1,17 @@
 # PG lossless profiles.
-# speed cable size    xon  xoff threshold xon_offset
-  10000  5m   1248    2288 35776  -3        2288
-  25000  5m   1248    2288 53248  -3        2288
-  40000  5m   1248    2288 66560  -3        2288
-  50000  5m   1248    2288 90272  -3        2288
- 100000  5m   1248    2288 165568 -3        2288
-  10000  40m  1248    2288 37024  -3        2288
-  25000  40m  1248    2288 53248  -3        2288
-  40000  40m  1248    2288 71552  -3        2288
-  50000  40m  1248    2288 96096  -3        2288
- 100000  40m  1248    2288 177632 -3        2288
-  10000  300m 1248    2288 46176  -3        2288
-  25000  300m 1248    2288 79040  -3        2288
-  40000  300m 1248    2288 108160 -3        2288
-  50000  300m 1248    2288 141856 -3        2288
- 100000  300m 1248    2288 268736 -3        2288
+# speed cable   size    xon   xoff threshold xon_offset
+  10000  5m     1024    2048  46080   -3        2048
+  25000  5m     1024    2048  65024   -3        2048
+  40000  5m     1024    2048  77056   -3        2048
+  50000  5m     1024    2048  93440   -3        2048
+ 100000  5m     1024    2048 162048   -3        2048
+  10000  40m    1024    2048  47360   -3        2048
+  25000  40m    1024    2048  67840   -3        2048
+  40000  40m    1024    2048  81664   -3        2048
+  50000  40m    1024    2048  99072   -3        2048
+ 100000  40m    1024    2048 173568   -3        2048
+  10000  300m   1024    2048  57088   -3        2048
+  25000  300m   1024    2048  92672   -3        2048
+  40000  300m   1024    2048 121344   -3        2048
+  50000  300m   1024    2048 148736   -3        2048
+ 100000  300m   1024    2048 272640   -3        2048
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/pg_profile_lookup.ini
@@ -1,17 +1,17 @@
 # PG lossless profiles.
-# speed cable size    xon  xoff threshold xon_offset
-  10000  5m   1248    2288 35776  -3        2288
-  25000  5m   1248    2288 53248  -3        2288
-  40000  5m   1248    2288 66560  -3        2288
-  50000  5m   1248    2288 90272  -3        2288
- 100000  5m   1248    2288 165568 -3        2288
-  10000  40m  1248    2288 37024  -3        2288
-  25000  40m  1248    2288 53248  -3        2288
-  40000  40m  1248    2288 71552  -3        2288
-  50000  40m  1248    2288 96096  -3        2288
- 100000  40m  1248    2288 177632 -3        2288
-  10000  300m 1248    2288 46176  -3        2288
-  25000  300m 1248    2288 79040  -3        2288
-  40000  300m 1248    2288 108160 -3        2288
-  50000  300m 1248    2288 141856 -3        2288
- 100000  300m 1248    2288 268736 -3        2288
+# speed cable   size    xon   xoff threshold xon_offset
+  10000  5m     1024    2048  46080   -3        2048
+  25000  5m     1024    2048  65024   -3        2048
+  40000  5m     1024    2048  77056   -3        2048
+  50000  5m     1024    2048  93440   -3        2048
+ 100000  5m     1024    2048 162048   -3        2048
+  10000  40m    1024    2048  47360   -3        2048
+  25000  40m    1024    2048  67840   -3        2048
+  40000  40m    1024    2048  81664   -3        2048
+  50000  40m    1024    2048  99072   -3        2048
+ 100000  40m    1024    2048 173568   -3        2048
+  10000  300m   1024    2048  57088   -3        2048
+  25000  300m   1024    2048  92672   -3        2048
+  40000  300m   1024    2048 121344   -3        2048
+  50000  300m   1024    2048 148736   -3        2048
+ 100000  300m   1024    2048 272640   -3        2048
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable   size    xon   xoff threshold xon_offset
+  10000  5m     1024    2048  46080   -3        2048
+  25000  5m     1024    2048  65024   -3        2048
+  40000  5m     1024    2048  77056   -3        2048
+  50000  5m     1024    2048  93440   -3        2048
+ 100000  5m     1024    2048 162048   -3        2048
+  10000  40m    1024    2048  47360   -3        2048
+  25000  40m    1024    2048  67840   -3        2048
+  40000  40m    1024    2048  81664   -3        2048
+  50000  40m    1024    2048  99072   -3        2048
+ 100000  40m    1024    2048 173568   -3        2048
+  10000  300m   1024    2048  57088   -3        2048
+  25000  300m   1024    2048  92672   -3        2048
+  40000  300m   1024    2048 121344   -3        2048
+  50000  300m   1024    2048 148736   -3        2048
+ 100000  300m   1024    2048 272640   -3        2048
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable   size    xon   xoff threshold xon_offset
+  10000  5m     1024    2048  46080   -3        2048
+  25000  5m     1024    2048  65024   -3        2048
+  40000  5m     1024    2048  77056   -3        2048
+  50000  5m     1024    2048  93440   -3        2048
+ 100000  5m     1024    2048 162048   -3        2048
+  10000  40m    1024    2048  47360   -3        2048
+  25000  40m    1024    2048  67840   -3        2048
+  40000  40m    1024    2048  81664   -3        2048
+  50000  40m    1024    2048  99072   -3        2048
+ 100000  40m    1024    2048 173568   -3        2048
+  10000  300m   1024    2048  57088   -3        2048
+  25000  300m   1024    2048  92672   -3        2048
+  40000  300m   1024    2048 121344   -3        2048
+  50000  300m   1024    2048 148736   -3        2048
+ 100000  300m   1024    2048 272640   -3        2048
diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable   size    xon   xoff threshold xon_offset
+  10000  5m     1024    2048  46080   -3        2048
+  25000  5m     1024    2048  65024   -3        2048
+  40000  5m     1024    2048  77056   -3        2048
+  50000  5m     1024    2048  93440   -3        2048
+ 100000  5m     1024    2048 162048   -3        2048
+  10000  40m    1024    2048  47360   -3        2048
+  25000  40m    1024    2048  67840   -3        2048
+  40000  40m    1024    2048  81664   -3        2048
+  50000  40m    1024    2048  99072   -3        2048
+ 100000  40m    1024    2048 173568   -3        2048
+  10000  300m   1024    2048  57088   -3        2048
+  25000  300m   1024    2048  92672   -3        2048
+  40000  300m   1024    2048 121344   -3        2048
+  50000  300m   1024    2048 148736   -3        2048
+ 100000  300m   1024    2048 272640   -3        2048
diff --git a/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f-C64/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f-C64/pg_profile_lookup.ini
@@ -1,17 +1,17 @@
 # PG lossless profiles.
-# speed cable size    xon  xoff threshold xon_offset
-  10000  5m   1248    2288 35776  -3        2288
-  25000  5m   1248    2288 53248  -3        2288
-  40000  5m   1248    2288 66560  -3        2288
-  50000  5m   1248    2288 90272  -3        2288
- 100000  5m   1248    2288 165568 -3        2288
-  10000  40m  1248    2288 37024  -3        2288
-  25000  40m  1248    2288 53248  -3        2288
-  40000  40m  1248    2288 71552  -3        2288
-  50000  40m  1248    2288 96096  -3        2288
- 100000  40m  1248    2288 177632 -3        2288
-  10000  300m 1248    2288 46176  -3        2288
-  25000  300m 1248    2288 79040  -3        2288
-  40000  300m 1248    2288 108160 -3        2288
-  50000  300m 1248    2288 141856 -3        2288
- 100000  300m 1248    2288 268736 -3        2288
+# speed cable size    xon   xoff threshold xon_offset
+  10000  5m   1248    2288  38064  -3        2288
+  25000  5m   1248    2288  52000  -3        2288
+  40000  5m   1248    2288  64728  -3        2288
+  50000  5m   1248    2288  77168  -3        2288
+ 100000  5m   1248    2288  136032 -3        2288
+  10000  40m  1248    2288  39104  -3        2288
+  25000  40m  1248    2288  54288  -3        2288
+  40000  40m  1248    2288  69472  -3        2288
+  50000  40m  1248    2288  81744  -3        2288
+ 100000  40m  1248    2288  145392 -3        2288
+  10000  300m 1248    2288  47216  -3        2288
+  25000  300m 1248    2288  74464  -3        2288
+  40000  300m 1248    2288  101712 -3        2288
+  50000  300m 1248    2288  122096 -3        2288
+ 100000  300m 1248    2288  225680 -3        2288
diff --git a/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f-C8D112/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f-C8D112/pg_profile_lookup.ini
@@ -1,17 +1,17 @@
 # PG lossless profiles.
-# speed cable size    xon  xoff threshold xon_offset
-  10000  5m   1248    2288 35776  -3        2288
-  25000  5m   1248    2288 53248  -3        2288
-  40000  5m   1248    2288 66560  -3        2288
-  50000  5m   1248    2288 90272  -3        2288
- 100000  5m   1248    2288 165568 -3        2288
-  10000  40m  1248    2288 37024  -3        2288
-  25000  40m  1248    2288 53248  -3        2288
-  40000  40m  1248    2288 71552  -3        2288
-  50000  40m  1248    2288 96096  -3        2288
- 100000  40m  1248    2288 177632 -3        2288
-  10000  300m 1248    2288 46176  -3        2288
-  25000  300m 1248    2288 79040  -3        2288
-  40000  300m 1248    2288 108160 -3        2288
-  50000  300m 1248    2288 141856 -3        2288
- 100000  300m 1248    2288 268736 -3        2288
+# speed cable size    xon   xoff threshold xon_offset
+  10000  5m   1248    2288  38064  -3        2288
+  25000  5m   1248    2288  52000  -3        2288
+  40000  5m   1248    2288  64728  -3        2288
+  50000  5m   1248    2288  77168  -3        2288
+ 100000  5m   1248    2288  136032 -3        2288
+  10000  40m  1248    2288  39104  -3        2288
+  25000  40m  1248    2288  54288  -3        2288
+  40000  40m  1248    2288  69472  -3        2288
+  50000  40m  1248    2288  81744  -3        2288
+ 100000  40m  1248    2288  145392 -3        2288
+  10000  300m 1248    2288  47216  -3        2288
+  25000  300m 1248    2288  74464  -3        2288
+  40000  300m 1248    2288  101712 -3        2288
+  50000  300m 1248    2288  122096 -3        2288
+ 100000  300m 1248    2288  225680 -3        2288
diff --git a/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f-Q64/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f-Q64/pg_profile_lookup.ini
@@ -1,17 +1,17 @@
 # PG lossless profiles.
-# speed cable size    xon  xoff threshold xon_offset
-  10000  5m   1248    2288 35776  -3        2288
-  25000  5m   1248    2288 53248  -3        2288
-  40000  5m   1248    2288 66560  -3        2288
-  50000  5m   1248    2288 90272  -3        2288
- 100000  5m   1248    2288 165568 -3        2288
-  10000  40m  1248    2288 37024  -3        2288
-  25000  40m  1248    2288 53248  -3        2288
-  40000  40m  1248    2288 71552  -3        2288
-  50000  40m  1248    2288 96096  -3        2288
- 100000  40m  1248    2288 177632 -3        2288
-  10000  300m 1248    2288 46176  -3        2288
-  25000  300m 1248    2288 79040  -3        2288
-  40000  300m 1248    2288 108160 -3        2288
-  50000  300m 1248    2288 141856 -3        2288
- 100000  300m 1248    2288 268736 -3        2288
+# speed cable size    xon   xoff threshold xon_offset
+  10000  5m   1248    2288  38064  -3        2288
+  25000  5m   1248    2288  52000  -3        2288
+  40000  5m   1248    2288  64728  -3        2288
+  50000  5m   1248    2288  77168  -3        2288
+ 100000  5m   1248    2288  136032 -3        2288
+  10000  40m  1248    2288  39104  -3        2288
+  25000  40m  1248    2288  54288  -3        2288
+  40000  40m  1248    2288  69472  -3        2288
+  50000  40m  1248    2288  81744  -3        2288
+ 100000  40m  1248    2288  145392 -3        2288
+  10000  300m 1248    2288  47216  -3        2288
+  25000  300m 1248    2288  74464  -3        2288
+  40000  300m 1248    2288  101712 -3        2288
+  50000  300m 1248    2288  122096 -3        2288
+ 100000  300m 1248    2288  225680 -3        2288
diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-C32/th3-z9332f-32x100G.config.bcm
@@ -1,3 +1,4 @@
+sai_tunnel_global_sip_mask_enable=1
 core_clock_frequency=1325
 dpr_clock_frequency=1000
 device_clock_frequency=1325

diff --git a/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t0.j2
@@ -26,13 +26,13 @@
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "66800476",
+            "size": "66394076",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "8644128"
         },
         "egress_lossless_pool": {
-            "size": "66800476",
+            "size": "55921148",
             "type": "egress",
             "mode": "static"
         }
@@ -41,7 +41,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "static_th":"66800476"
+            "static_th":"66394076"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",