Merge branch 'master' into system-health

.gitignore

@@ -5,6 +5,7 @@
 .arch
 .platform
 .screen
+rules/config.user
 
 # Build artifacts
 fsroot/
@@ -60,5 +61,3 @@ 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/vs/docker-sonic-vs/init_cfg.json
-platform/p4/docker-sonic-p4/init_cfg.json

Makefile.cache

@@ -89,11 +89,13 @@ endif
 -include $(PLATFORM_PATH)/rules.dep
 endif
 
+ifndef SONIC_BUILD_QUIETER
 $(info "SONIC_DPKG_CACHE_METHOD"         : "$(SONIC_DPKG_CACHE_METHOD)")
 ifneq ($(SONIC_DPKG_CACHE_METHOD),none)
 $(info "DPKG_CACHE_PATH"                 : "$(SONIC_DPKG_CACHE_SOURCE)")
 endif
 $(info )
+endif
 
 
 ###############################################################################

Makefile.work

@@ -38,7 +38,6 @@
 #  * SONIC_DPKG_CACHE_METHOD: Specifying method of obtaining the Debian packages from cache: none or cache
 #  * SONIC_DPKG_CACHE_SOURCE: Debian package cache location when cache enabled for debian packages
 #  * BUILD_LOG_TIMESTAMP: Set timestamp in the build log (simple/none)
-#  * ENABLE_SYNCHRONOUS_MODE: Enable synchronous mode between orchagent and syncd
 #
 ###############################################################################
 
@@ -116,14 +115,19 @@ DOCKER_RUN := docker run --rm=true --privileged --init \
     -w $(DOCKER_BUILDER_WORKDIR) \
     -e "http_proxy=$(http_proxy)" \
     -e "https_proxy=$(https_proxy)" \
-    -i$(if $(TERM),t,)
+    -i$(if $(TERM),t,) \
+    $(SONIC_BUILDER_EXTRA_CMDLINE)
 
 include rules/config
 
 ifneq ($(DOCKER_BUILDER_USER_MOUNT),)
 	DOCKER_RUN += $(foreach mount,$(subst $(comma), ,$(DOCKER_BUILDER_USER_MOUNT)), $(addprefix -v , $(mount)))
 endif
 
+ifdef SONIC_BUILD_QUIETER
+	DOCKER_RUN += -e "SONIC_BUILD_QUIETER=$(SONIC_BUILD_QUIETER)"
+endif
+
 ifneq ($(SONIC_DPKG_CACHE_SOURCE),)
 	DOCKER_RUN += -v "$(SONIC_DPKG_CACHE_SOURCE):/dpkg_cache:rw"
 endif
@@ -186,6 +190,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            PLATFORM_ARCH=$(PLATFORM_ARCH) \
                            BUILD_NUMBER=$(BUILD_NUMBER) \
                            BUILD_TIMESTAMP=$(BUILD_TIMESTAMP) \
+                           SONIC_IMAGE_VERSION=$(SONIC_IMAGE_VERSION) \
                            ENABLE_DHCP_GRAPH_SERVICE=$(ENABLE_DHCP_GRAPH_SERVICE) \
                            ENABLE_ZTP=$(ENABLE_ZTP) \
                            SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \
@@ -213,7 +218,6 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            EXTRA_DOCKER_TARGETS=$(EXTRA_DOCKER_TARGETS) \
                            BUILD_LOG_TIMESTAMP=$(BUILD_LOG_TIMESTAMP) \
                            SONIC_ENABLE_IMAGE_SIGNATURE=$(ENABLE_IMAGE_SIGNATURE) \
-                           ENABLE_SYNCHRONOUS_MODE=$(ENABLE_SYNCHRONOUS_MODE) \
                            $(SONIC_OVERRIDE_BUILD_VARS)
 
 .PHONY: sonic-slave-build sonic-slave-bash init reset

build_debian.sh

@@ -242,9 +242,12 @@ sudo cp files/docker/docker.service.conf $_
 ## Fix systemd race between docker and containerd
 sudo sed -i '/After=/s/$/ containerd.service/' $FILESYSTEM_ROOT/lib/systemd/system/docker.service
 
+## Create redis group
+sudo LANG=C chroot $FILESYSTEM_ROOT groupadd -f redis
+
 ## Create default user
-## Note: user should be in the group with the same name, and also in sudo/docker group
-sudo LANG=C chroot $FILESYSTEM_ROOT useradd -G sudo,docker $USERNAME -c "$DEFAULT_USERINFO" -m -s /bin/bash
+## Note: user should be in the group with the same name, and also in sudo/docker/redis groups
+sudo LANG=C chroot $FILESYSTEM_ROOT useradd -G sudo,docker,redis $USERNAME -c "$DEFAULT_USERINFO" -m -s /bin/bash
 ## Create password for the default user
 echo "$USERNAME:$PASSWORD" | sudo LANG=C chroot $FILESYSTEM_ROOT chpasswd
 
@@ -312,8 +315,13 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     python-pip              \
     python3-pip             \
     cron                    \
-    haveged
+    haveged                 \
+    jq
 
+# Install "wheel" package so that we can install .whl packages and not
+# encounter a "error: invalid command 'bdist_wheel'" error
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install wheel
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install wheel
 
 if [[ $CONFIGURED_ARCH == amd64 ]]; then
 ## Pre-install the fundamental packages for amd64 (x86)
@@ -393,7 +401,7 @@ sudo mkdir -p $FILESYSTEM_ROOT/var/core
 
 # Config sysctl
 sudo augtool --autosave "
-set /files/etc/sysctl.conf/kernel.core_pattern '|/usr/bin/coredump-compress %e %t %p'
+set /files/etc/sysctl.conf/kernel.core_pattern '|/usr/local/bin/coredump-compress %e %t %p %P'
 set /files/etc/sysctl.conf/kernel.softlockup_panic 1
 set /files/etc/sysctl.conf/kernel.panic 10
 set /files/etc/sysctl.conf/vm.panic_on_oom 2
@@ -446,7 +454,7 @@ fi
 ## Version file
 sudo mkdir -p $FILESYSTEM_ROOT/etc/sonic
 sudo tee $FILESYSTEM_ROOT/etc/sonic/sonic_version.yml > /dev/null <<EOF
-build_version: '$(sonic_get_version)'
+build_version: '${SONIC_IMAGE_VERSION}'
 debian_version: '$(cat $FILESYSTEM_ROOT/etc/debian_version)'
 kernel_version: '$kversion'
 asic_type: $sonic_asic_platform
@@ -483,7 +491,7 @@ fi
 sudo cp -f files/image_config/ebtables/ebtables.default $FILESYSTEM_ROOT/etc/default/ebtables
 sudo cp -f files/image_config/ebtables/ebtables.init $FILESYSTEM_ROOT/etc/init.d/ebtables
 sudo cp -f files/image_config/ebtables/ebtables.service $FILESYSTEM_ROOT/lib/systemd/system/ebtables.service
-sudo cp files/image_config/ebtables/ebtables.filter ${FILESYSTEM_ROOT}/etc
+sudo cp files/image_config/ebtables/ebtables.filter.cfg ${FILESYSTEM_ROOT}/etc
 sudo LANG=C chroot $FILESYSTEM_ROOT update-alternatives --set ebtables /usr/sbin/ebtables-legacy
 sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable ebtables.service
 

build_image.sh

@@ -23,7 +23,7 @@ fi
     exit 1
 }
 
-IMAGE_VERSION=$(. functions.sh && sonic_get_version)
+IMAGE_VERSION="${SONIC_IMAGE_VERSION}"
 
 generate_onie_installer_image()
 {

device/accton/x86_64-accton_as4630_54pe-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_as5712_54x-r0/Accton-AS5712-54X/td2-as5712-72x10G.config.bcm

@@ -3,7 +3,7 @@ bcm_stat_flags=0
 parity_enable=0
 parity_correction=0
 
-bcm_num_cos=8
+bcm_num_cos=10
 l2_mem_entries=32768
 l3_mem_entries=16384
 l3_alpm_enable=2

device/accton/x86_64-accton_as5712_54x-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_as5812_54t-r0/Accton-AS5812-54T/td2-as5812t-72x10G.config.bcm

@@ -1,4 +1,4 @@
-bcm_num_cos=8
+bcm_num_cos=10
 bcm_stat_flags=0
 bcm_stat_interval=2000000
 bcm_tunnel_term_compatible_mode=1

device/accton/x86_64-accton_as5812_54t-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_as5812_54x-r0/Accton-AS5812-54X/td2-as5812-72x10G.config.bcm

@@ -3,7 +3,7 @@ bcm_stat_flags=0
 parity_enable=0
 parity_correction=0
 
-bcm_num_cos=8
+bcm_num_cos=10
 l2_mem_entries=32768
 l3_mem_entries=16384
 l3_alpm_enable=2

device/accton/x86_64-accton_as5812_54x-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_as5835_54t-r0/Accton-AS5835-54T/mv2-as5835t-48x10G+6x100G.config.bcm

@@ -19,7 +19,7 @@ fpem_mem_entries=16384
 l2xmsg_mode=1
 
 # Platform specfic
-bcm_num_cos=8
+bcm_num_cos=10
 bcm_stat_interval=2000000
 cdma_timeout_usec=3000000
 ifp_inports_support_enable=1

device/accton/x86_64-accton_as5835_54t-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_as5835_54x-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_as6712_32x-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_as7116_54x-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_as7212_54x-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_as7312_54x-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_as7312_54xs-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_as7315_27xb-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_as7326_56x-r0/Accton-AS7326-56X/td3-as7326-48x25G+8x100G.config.bcm

@@ -14,7 +14,7 @@ fpem_mem_entries=16384
 l2xmsg_mode=1
 
 # Platform specfic
-bcm_num_cos=8
+bcm_num_cos=10
 bcm_stat_interval=2000000
 cdma_timeout_usec=3000000
 ifp_inports_support_enable=1

device/accton/x86_64-accton_as7326_56x-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_as7512_32x-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_as7712_32x-r0/Accton-AS7712-32X/th-as7712-32x100G.config.bcm

@@ -14,7 +14,7 @@ pbmp_xport_xe=0x444444451111111144444444422222222
 #
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
-bcm_num_cos=8
+bcm_num_cos=10
 bcm_stat_flags=1
 bcm_stat_jumbo=9236
 cdma_timeout_usec=15000000

device/accton/x86_64-accton_as7712_32x-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_as7716_32x-r0/Accton-AS7716-32X/th-as7716-32x100G.config.bcm

@@ -14,7 +14,7 @@ pbmp_xport_xe=0x444444451111111144444444422222222
 #
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
-bcm_num_cos=8
+bcm_num_cos=10
 bcm_stat_flags=1
 bcm_stat_jumbo=9236
 cdma_timeout_usec=15000000

device/accton/x86_64-accton_as7716_32x-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_as7716_32xb-r0/Accton-AS7716-32XB/th-as7716-32x100G.config.bcm

@@ -14,7 +14,7 @@ pbmp_xport_xe=0x444444451111111144444444422222222
 #
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
-bcm_num_cos=8
+bcm_num_cos=10
 bcm_stat_flags=1
 bcm_stat_jumbo=9236
 cdma_timeout_usec=15000000

device/accton/x86_64-accton_as7716_32xb-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_as7726_32x-r0/Accton-AS7726-32X/td3-as7726-32x100G.config.bcm

@@ -15,7 +15,7 @@ fpem_mem_entries=16384
 l2xmsg_mode=1
 
 # Platform specfic
-bcm_num_cos=8
+bcm_num_cos=10
 bcm_stat_interval=2000000
 cdma_timeout_usec=3000000
 ifp_inports_support_enable=1

device/accton/x86_64-accton_as7726_32x-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_as7816_64x-r0/Accton-AS7816-64X/th2-as7816-64x25G-48x100G_row1.config.bcm

@@ -14,7 +14,7 @@ pbmp_oversubscribe=0x1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 # platform specific setting
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
-bcm_num_cos=8
+bcm_num_cos=10
 bcm_stat_flags=1
 bcm_stat_jumbo=9236
 cdma_timeout_usec=15000000

device/accton/x86_64-accton_as7816_64x-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_as9716_32d-r0/pmon_daemon_control.json

@@ -1,4 +1,5 @@
 {
-    "skip_ledd": true
+    "skip_ledd": true,
+    "skip_thermalctld": true
 }
 

device/accton/x86_64-accton_minipack-r0/pmon_daemon_control.json

@@ -0,0 +1,5 @@
+{
+    "skip_ledd": true,
+    "skip_thermalctld": true
+}
+

device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm

@@ -37,7 +37,7 @@ stat_if_parity_enable=0
 l2xmsg_hostbuf_size=8192
 l2xmsg_mode=1
 
-bcm_num_cos=8
+bcm_num_cos=10
 bcm_stat_interval=2000000
 lls_num_l2uc=12
 max_vp_lags=0