From 6d2cb5278ee26a7619387bdda7dda36a0c37e826 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 23 Jul 2026 07:12:58 +1000 Subject: [PATCH 1/4] [docker-dash-engine]: Make supervisord-dependent-startup install base-agnostic (#28568) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### Why I did it `docker-dash-engine` builds `FROM p4lang/behavioral-model:latest`, whose `:latest` tag resolves to different Ubuntu bases across mirrors: - a newer PEP 668 base, where a plain system `pip3 install` is refused (`error: externally-managed-environment`), and - an older base whose `pip3` does not support `--break-system-packages` (`no such option: --break-system-packages`). So a plain install breaks on the first base and a `--break-system-packages` install breaks on the second; the step fails on one base or the other depending on which image `:latest` currently points to. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it - `platform/vs/docker-dash-engine/Dockerfile.j2`: install with `--break-system-packages` and fall back to a plain `pip3 install`, so the package installs regardless of whether the base `pip3` supports the flag: `RUN pip3 install --break-system-packages supervisord-dependent-startup || pip3 install supervisord-dependent-startup` - `scripts/docker_version_control.sh`: add `p4lang/behavioral-model` to the reproducible-build version-control whitelist so its digest recorded in `versions-docker` is actually pinned at build time (reduces `:latest` drift). #### How to verify it Build the `docker-dash-engine` image / `target/sonic-vs.img.gz`; the `supervisord-dependent-startup` install succeeds on both a PEP 668 base and an older base. #### Which release branch to backport (provide reason below if selected) This is a build fix; it can be backported to active release branches that build `docker-dash-engine` and hit the same base-image drift. - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 - [ ] 202511 - [ ] 202512 - [ ] 202605 - [ ] 202608 #### Tested branch - [x] master #### Test result Verified on both base variants. The PR CI (`Azure.sonic-buildimage`) build passed on this commit — all `BuildVS` (vs / alpinevs / vpp) and platform `Build` jobs are green; the public CI base exercises the older-pip path (the fallback to a plain `pip3 install`). The PEP 668 (Ubuntu 24.04) base path was verified on a separate internal build. #### Description for the changelog docker-dash-engine: install supervisord-dependent-startup so it works on both PEP 668 and older pip bases, and pin the p4lang base in version control. #### Link to config_db schema for YANG module changes N/A. No YANG or config_db schema changes. Signed-off-by: Sonic Build Admin --- platform/vs/docker-dash-engine/Dockerfile.j2 | 2 +- scripts/docker_version_control.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/vs/docker-dash-engine/Dockerfile.j2 b/platform/vs/docker-dash-engine/Dockerfile.j2 index 6fa6585567..8d55dffd9f 100644 --- a/platform/vs/docker-dash-engine/Dockerfile.j2 +++ b/platform/vs/docker-dash-engine/Dockerfile.j2 @@ -13,7 +13,7 @@ RUN sed -i 's|http://.*.ubuntu.com|http://azure.archive.ubuntu.com|g' /etc/apt/s RUN apt-get update RUN apt-get install -f -y net-tools supervisor rsyslog python3-pip -RUN pip3 install supervisord-dependent-startup +RUN pip3 install --break-system-packages supervisord-dependent-startup || pip3 install supervisord-dependent-startup COPY ["start.sh", "/usr/bin/"] diff --git a/scripts/docker_version_control.sh b/scripts/docker_version_control.sh index 549dc30f6e..eab6556f97 100755 --- a/scripts/docker_version_control.sh +++ b/scripts/docker_version_control.sh @@ -27,7 +27,7 @@ tag=`echo $image_tag | cut -f2 -d:` if [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,all,* ]] || [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,docker,* ]]; then # if docker image not in white list, exit - if [[ "$image_tag" != */debian:* ]] && [[ "$image_tag" != debian:* ]] && [[ "$image_tag" != multiarch/debian-debootstrap:* ]];then + if [[ "$image_tag" != */debian:* ]] && [[ "$image_tag" != debian:* ]] && [[ "$image_tag" != multiarch/debian-debootstrap:* ]] && [[ "$image_tag" != *p4lang/behavioral-model:* ]];then exit 0 fi if [ -f $version_file ];then From cb19cc154cfcf7e673c44395f21936b5147fb904 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 23 Jul 2026 19:12:38 +1000 Subject: [PATCH 2/4] [submodule] Update submodule sonic-swss to the latest HEAD automatically (#28557) #### Why I did it src/sonic-swss ``` * a7aded92 - (HEAD -> 202511, origin/202511) hftelorch: minor improvements and cleanups for high frequency telemetry (#4315) (#4701) (2 days ago) [Ze Gan] ``` #### How I did it #### How to verify it #### Description for the changelog --- src/sonic-swss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss b/src/sonic-swss index f1669f4ffe..a7aded9294 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit f1669f4ffec7732d6faa42c617765275ca81dd5f +Subproject commit a7aded92945d6d103ff8fe78b7ca019af2b089e9 From 071dadf0127625bb134ee8429ebbe66814da4fc5 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 23 Jul 2026 20:12:40 +1000 Subject: [PATCH 3/4] [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#28589) #### Why I did it src/sonic-platform-daemons ``` * bf691af - (HEAD -> 202511, origin/202511) [202511] Continue CMIS state even if Decommission fails (#859) (22 hours ago) [Prince George] * 08576c0 - [xcvrd] Support mixed application codes in CMIS decommission logic (#794) (#860) (22 hours ago) [mihirpat1] ``` #### How I did it #### How to verify it #### Description for the changelog --- src/sonic-platform-daemons | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons index 39f4577074..bf691af3ad 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit 39f4577074ef4ab67a354a10db73f72eb7299f89 +Subproject commit bf691af3ada9fe0875568e255779f809bb305377 From 14d58014ad06b586cdda18b046133d92dadf1fbc Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 23 Jul 2026 20:12:47 +1000 Subject: [PATCH 4/4] [submodule] Update submodule sonic-swss-common to the latest HEAD automatically (#28590) #### Why I did it src/sonic-swss-common ``` * e59457c - (HEAD -> 202511, origin/202511) replace python3-pip with uv (#1226) (22 hours ago) [yijingyan2] ``` #### How I did it #### How to verify it #### Description for the changelog --- src/sonic-swss-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss-common b/src/sonic-swss-common index fd8a79fe20..e59457c6da 160000 --- a/src/sonic-swss-common +++ b/src/sonic-swss-common @@ -1 +1 @@ -Subproject commit fd8a79fe20941939990f1e90003bc44c2a6fb547 +Subproject commit e59457c6da43aa8fcd433c772d47274f24a79da6