From 462b7d17b3b1a1341d945dfe2537b9e13cbd30dc Mon Sep 17 00:00:00 2001 From: Lawrence Lee Date: Tue, 14 Jul 2026 16:40:25 +0000 Subject: [PATCH] [ci][DO-NOT-MERGE]: pin swss-common to PR #1222 build 1164874 (migration validation) Draft PR to validate that sonic-sairedis 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-swss-template, build-docker, test-docker) to runVersion: specific / runId: 1164874 (the green #1222 build) instead of latestFromBranch on $(BUILD_BRANCH). #1222's swss-common builds against STOCK apt libnl, so libswsscommon Depends on the stock libnl already present in every sonic-sairedis build/test/docker environment -- 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-swss-template.yml | 8 ++++++-- .azure-pipelines/build-template.yml | 8 ++++++-- .azure-pipelines/test-docker-sonic-vs-template.yml | 8 ++++++-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.azure-pipelines/build-docker-sonic-vs-template.yml b/.azure-pipelines/build-docker-sonic-vs-template.yml index 1aea08e4cd..69625fe596 100644 --- a/.azure-pipelines/build-docker-sonic-vs-template.yml +++ b/.azure-pipelines/build-docker-sonic-vs-template.yml @@ -45,8 +45,12 @@ jobs: pipeline: Azure.sonic-swss-common artifact: ${{ parameters.swss_common_artifact_name }} path: $(Build.ArtifactStagingDirectory)/download - runVersion: 'latestFromBranch' - runBranch: 'refs/heads/$(BUILD_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/$(BUILD_BRANCH) before merge. + runVersion: 'specific' + runId: '1164874' allowPartiallySucceededBuilds: true displayName: "Download sonic swss common deb packages" - task: DownloadPipelineArtifact@2 diff --git a/.azure-pipelines/build-swss-template.yml b/.azure-pipelines/build-swss-template.yml index 0ea7e54866..d06dcd02b3 100644 --- a/.azure-pipelines/build-swss-template.yml +++ b/.azure-pipelines/build-swss-template.yml @@ -108,8 +108,12 @@ jobs: project: build pipeline: Azure.sonic-swss-common artifact: ${{ parameters.swss_common_artifact_name }} - runVersion: 'latestFromBranch' - runBranch: 'refs/heads/$(BUILD_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/$(BUILD_BRANCH) before merge. + runVersion: 'specific' + runId: '1164874' allowPartiallySucceededBuilds: true path: $(Build.ArtifactStagingDirectory)/download patterns: | diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml index 1c5e620082..e2805e2025 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -220,8 +220,12 @@ jobs: project: build pipeline: Azure.sonic-swss-common artifact: ${{ parameters.swss_common_artifact_name }} - runVersion: 'latestFromBranch' - runBranch: 'refs/heads/$(BUILD_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/$(BUILD_BRANCH) before merge. + runVersion: 'specific' + runId: '1164874' allowPartiallySucceededBuilds: true path: $(Build.ArtifactStagingDirectory)/download displayName: "Download sonic swss common deb packages" diff --git a/.azure-pipelines/test-docker-sonic-vs-template.yml b/.azure-pipelines/test-docker-sonic-vs-template.yml index 1adf5d6cee..57af61bfa4 100644 --- a/.azure-pipelines/test-docker-sonic-vs-template.yml +++ b/.azure-pipelines/test-docker-sonic-vs-template.yml @@ -54,8 +54,12 @@ jobs: pipeline: Azure.sonic-swss-common artifact: sonic-swss-common.amd64.ubuntu22_04 path: $(Build.ArtifactStagingDirectory)/download - runVersion: 'latestFromBranch' - runBranch: 'refs/heads/$(BUILD_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/$(BUILD_BRANCH) before merge. + runVersion: 'specific' + runId: '1164874' allowPartiallySucceededBuilds: true displayName: "Download sonic swss common deb packages" - task: DownloadPipelineArtifact@2