Merge pull request #177 from mssonicbld/sonicbld/202305-merge

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305
Azure · Dec 5, 2023 · 349c150 · 349c150
2 parents ac85ddf + 1c1a13f
commit 349c150
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -35,8 +35,8 @@ RUN apt-get update &&   \
 # doesn't ensure all dependencies are installed in the container. So here we
 # install any dependencies required by the Arista sonic_platform package.
 # TODO: eliminate the need to install these explicitly.
-RUN pip3 install grpcio==1.57.0 \
-        grpcio-tools==1.57.0
+RUN pip3 install grpcio==1.39.0 \
+        grpcio-tools==1.39.0
 
 # Barefoot platform vendors' sonic_platform packages import these Python libraries
 RUN pip3 install thrift==0.13.0 netifaces

diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3
@@ -1,8 +1,8 @@
 attrs==20.3.0
 certifi==2023.5.7
 charset-normalizer==3.1.0
-grpcio==1.57.0
-grpcio-tools==1.57.0
+grpcio==1.39.0
+grpcio-tools==1.39.0
 guacamole==0.9.2
 idna==3.4
 importlib-metadata==1.6.0

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
@@ -1,4 +1,4 @@
-LIBSAIBCM_XGS_VERSION = 8.4.21.0
+LIBSAIBCM_XGS_VERSION = 8.4.31.0
 LIBSAIBCM_DNX_VERSION = 7.1.111.1
 LIBSAIBCM_XGS_BRANCH_NAME = SAI_8.4.0_GA
 LIBSAIBCM_DNX_BRANCH_NAME = REL_7.0_SAI_1.11

diff --git a/src/sonic-restapi b/src/sonic-restapi