From a70c30a5e49bae106938728337a37bec132c64a7 Mon Sep 17 00:00:00 2001 From: Lawrence Lee Date: Tue, 14 Jul 2026 16:51:31 +0000 Subject: [PATCH] [ci][DO-NOT-MERGE]: pin swss-common to PR #1222 build 1164874 (migration validation) Draft PR to validate that sonic-swss builds + tests green against the sonic-swss-common CI-unification migration PR (sonic-net/sonic-swss-common#1222). Pin every 'Download sonic swss common' step (build-template, build-docker, test-docker) to runVersion: specific / runId: 1164874 (the green #1222 build) instead of latestFromBranch on the swss_common_branch parameter. #1222's swss-common builds against STOCK apt libnl, so libswsscommon Depends on the stock libnl already present in every sonic-swss build/test/docker environment (the build stage installs it from common-lib; the test host resolves it via apt) -- no SONiC-libnl companion changes are needed here (only the pin). NOT for merge -- the runId pin is temporary; revert to latestFromBranch before merge. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Lawrence Lee --- .azure-pipelines/build-docker-sonic-vs-template.yml | 8 ++++++-- .azure-pipelines/build-template.yml | 8 ++++++-- .azure-pipelines/test-docker-sonic-vs-template.yml | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.azure-pipelines/build-docker-sonic-vs-template.yml b/.azure-pipelines/build-docker-sonic-vs-template.yml index 1f7733c898..09588845cd 100644 --- a/.azure-pipelines/build-docker-sonic-vs-template.yml +++ b/.azure-pipelines/build-docker-sonic-vs-template.yml @@ -87,8 +87,12 @@ jobs: project: build pipeline: Azure.sonic-swss-common artifact: ${{ parameters.swss_common_artifact_name }} - runVersion: 'latestFromBranch' - runBranch: 'refs/heads/${{ parameters.swss_common_branch }}' + # PINNED to sonic-swss-common PR #1222 build 1164874 (CI-unification migration + # validation): build against the migration swss-common (stock apt libnl, + # published build-env/). Revert to latestFromBranch / runBranch: + # refs/heads/${{ parameters.swss_common_branch }} before merge. + runVersion: 'specific' + runId: '1164874' path: $(Build.ArtifactStagingDirectory)/download allowPartiallySucceededBuilds: true displayName: "Download sonic swss common deb packages" diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml index ddf4cd2268..d2e7a1780d 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -131,8 +131,12 @@ jobs: project: build pipeline: Azure.sonic-swss-common artifact: ${{ parameters.swss_common_artifact_name }} - runVersion: 'latestFromBranch' - runBranch: 'refs/heads/${{ parameters.swss_common_branch }}' + # PINNED to sonic-swss-common PR #1222 build 1164874 (CI-unification migration + # validation): build against the migration swss-common (stock apt libnl, + # published build-env/). Revert to latestFromBranch / runBranch: + # refs/heads/${{ parameters.swss_common_branch }} before merge. + runVersion: 'specific' + runId: '1164874' allowPartiallySucceededBuilds: true path: $(Build.ArtifactStagingDirectory)/download/swsscommon patterns: | diff --git a/.azure-pipelines/test-docker-sonic-vs-template.yml b/.azure-pipelines/test-docker-sonic-vs-template.yml index 9d9c1bdae3..9e8922abcf 100644 --- a/.azure-pipelines/test-docker-sonic-vs-template.yml +++ b/.azure-pipelines/test-docker-sonic-vs-template.yml @@ -75,8 +75,12 @@ jobs: project: build pipeline: Azure.sonic-swss-common artifact: sonic-swss-common.amd64.ubuntu22_04 - runVersion: 'latestFromBranch' - runBranch: 'refs/heads/${{ parameters.swss_common_branch }}' + # PINNED to sonic-swss-common PR #1222 build 1164874 (CI-unification migration + # validation): build against the migration swss-common (stock apt libnl, + # published build-env/). Revert to latestFromBranch / runBranch: + # refs/heads/${{ parameters.swss_common_branch }} before merge. + runVersion: 'specific' + runId: '1164874' path: $(Build.ArtifactStagingDirectory)/download allowPartiallySucceededBuilds: true displayName: "Download sonic swss common deb packages"