[ci]: Pin sonic-buildimage to pre-LLDP build to unblock vstests#1958
Merged
Conversation
Temporarily pin the sonic-buildimage docker-sonic-vs artifact download to build 1141167 (20260617.1, commit f1d42c1) - the last master sonic-buildimage build before PR #26724 merged. sonic-buildimage PR #26724 renamed the docker-sonic-vs supervisor program from "start.sh" to "start" in platform/vs/docker-sonic-vs/supervisord.conf.j2. The DVS readiness check in the vs tests polls for the "start.sh" program to be EXITED, so with the new base image the poll never succeeds and every DVS spin-up times out after 60s, failing all vs test modules. Pinning the Azure.sonic-buildimage.official.vs / sonic-buildimage.vs download to the known-good build unblocks sonic-sairedis CI while the upstream issue is resolved. Revert to latestFromBranch afterwards. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
lolyu
marked this pull request as ready for review
June 26, 2026 03:05
Contributor
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
yijingyan2
approved these changes
Jun 26, 2026
Contributor
|
What's the agreed direction here — unblock sonic-sairedis CI with this temporary image pin now, or wait for the buildimage fix (revert #28054) to land first? A few PRs (e.g. #1919) are blocked on the red vstest. |
deepak-singhal0408
approved these changes
Jun 26, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of PR
Temporarily pin the sonic-buildimage
docker-sonic-vsartifact download to build 1141167 (20260617.1, commitf1d42c1a) — the last master sonic-buildimage build before PR #26724 merged and broke the DVS (vs) tests.This mirrors the same workaround applied in sonic-swss PR #4700.
Summary:
Fixes # (issue)
Type of change
Approach
What is the motivation for this PR?
sonic-buildimage PR #26724 renamed the docker-sonic-vs supervisor program from
start.shtostartinplatform/vs/docker-sonic-vs/supervisord.conf.j2. The vs tests' DVS readiness check (DockerVirtualSwitch.check_services_ready) polls for thestart.shprogram to beEXITED. With the renamed program,process_status.get("start.sh")returnsNone, so the readiness poll never succeeds, every DVS spin-up times out after 60s, and all vs test modules fail at setup (with teardown then failing with'NoneType' object has no attribute 'get_logs').This blocks sonic-sairedis CI. Pinning the buildimage VS artifact to the last known-good build unblocks CI while the upstream issue is resolved.
Work item tracking
How did you do it?
In
.azure-pipelines/build-docker-sonic-vs-template.yml, changed theAzure.sonic-buildimage.official.vs/sonic-buildimage.vsdownload fromlatestFromBranchtospecificwithrunId: 1141167.This is the only sonic-sairedis download from that pipeline (it fetches just
docker-sonic-vs.gz), so it is the single place that needs pinning. Unlike sonic-swss PR #4700 — which pins two tasks from that pipeline (thedocker-sonic-vs.gzimage and aframework_*.deb) — sonic-sairedis never downloads the sonic-framework deb, so only one hunk is required. Other artifacts (swss-common, sairedis, dash-api,Azure.sonic-buildimage.common_libslibnexthopgroup, vpp) are from different pipelines unaffected by the rename and remain onlatestFromBranch.This is a temporary workaround — revert to
latestFromBranchonce sonic-buildimage PR #26724 is fixed.How did you verify/test it?
CI will download the pinned artifact and run DVS tests against the known-good buildimage. YAML validated locally (
yaml.safe_load).Any platform specific information?
CI/pipeline-only change (
virtual switchDVS tests). No production code or runtime behavior is affected.Documentation
N/A — temporary CI workaround, no documentation/Wiki changes needed.