[pull] master from Azure:master

platform/broadcom/sonic-platform-modules-dell/common/ipmihelper.py

@@ -38,7 +38,7 @@ def get_ipmitool_raw_output(args):
         proc.wait()
         if not proc.returncode:
             result = stdout.rstrip('\n')
-    except:
+    except EnvironmentError:
         pass
 
     for i in result.split():
@@ -180,7 +180,7 @@ def _get_ipmitool_fru_print(self):
             proc.wait()
             if not proc.returncode:
                 result = stdout.decode('utf-8').rstrip('\n')
-        except:
+        except EnvironmentError:
             pass
 
         return result
@@ -253,7 +253,7 @@ def get_fru_data(self, offset, count=1):
             proc.wait()
             if not proc.returncode:
                 result = stdout.decode('utf-8').rstrip('\n')
-        except:
+        except EnvironmentError:
             is_valid = False
 
         if (not result) or (not is_valid):

rules/docker-config-engine-stretch.mk

@@ -2,6 +2,7 @@
 
 DOCKER_CONFIG_ENGINE_STRETCH = docker-config-engine-stretch.gz
 $(DOCKER_CONFIG_ENGINE_STRETCH)_PATH = $(DOCKERS_PATH)/docker-config-engine-stretch
+$(DOCKER_CONFIG_ENGINE_STRETCH)_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON2_SWSSCOMMON)
 $(DOCKER_CONFIG_ENGINE_STRETCH)_PYTHON_WHEELS += $(SWSSSDK_PY2)
 $(DOCKER_CONFIG_ENGINE_STRETCH)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY2)
 $(DOCKER_CONFIG_ENGINE_STRETCH)_PYTHON_WHEELS += $(SONIC_CONFIG_ENGINE_PY2)

sonic-slave-buster/Dockerfile.j2

@@ -61,7 +61,6 @@ RUN apt-get update && apt-get install -y \
         dh-exec \
         kmod \
         libtinyxml2-6a \
-        libboost-program-options1.67-dev \
         libtinyxml2-dev \
         python \
         python-pip \
@@ -121,7 +120,6 @@ RUN apt-get update && apt-get install -y \
         module-assistant \
 # For thrift build\
         gem2deb \
-        libboost-all-dev \
         libevent-dev \
         libglib2.0-dev \
         libqt4-dev \
@@ -321,7 +319,27 @@ RUN apt-get update && apt-get install -y \
         docbook-to-man       \
         docbook-utils        \
 # For kdump-tools
-        libbz2-dev
+        libbz2-dev \
+# For linkmgrd
+        libboost1.71-dev \
+        libboost-program-options1.71-dev \
+        libboost-system1.71-dev \
+        libboost-thread1.71-dev \
+        libboost-atomic1.71-dev \
+        libboost-chrono1.71-dev \
+        libboost-container1.71-dev \
+        libboost-context1.71-dev \
+        libboost-contract1.71-dev \
+        libboost-coroutine1.71-dev \
+        libboost-date-time1.71-dev \
+        libboost-fiber1.71-dev \
+        libboost-filesystem1.71-dev \
+        libboost-graph-parallel1.71-dev \
+        libboost-log1.71-dev \
+        libboost-regex1.71-dev \
+        googletest \
+        libgtest-dev \
+        libgcc-8-dev
 
 # Build fix for ARMHF buster libsairedis
 {%- if CONFIGURED_ARCH == "armhf" %}

src/sonic-host-services/pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+addopts = --cov=scripts --cov-report html --cov-report term --cov-report xml