From 14a7ff18b951e90e37476131df5cf7a328fbb298 Mon Sep 17 00:00:00 2001
From: Brad House <bhouse@nexthop.ai>
Date: Sun, 31 May 2026 14:38:04 +0000
Subject: [PATCH] ci: migrate libyang1 references to libyang3

sonic-buildimage no longer builds the libyang1 debs (libyang_1.0.73,
libyang-cpp, python3-yang); it now builds only libyang3.

- .azure-pipelines/build.yml: download the libyang3 debs from the
  common_libs artifacts using versionless globs (libyang3_*.deb,
  libyang-dev_*.deb) instead of the libyang1 patterns.
- .github/workflows/codeql-analysis.yml: install libyang-dev from the
  distro apt repo in the prepare step (matching the other SONiC repos'
  CodeQL workflows, e.g. sonic-sairedis / sonic-linkmgrd) and drop the
  hardcoded sonic-build libyang1 deb downloads.
- lgtm.yml: keep the apt-provided libyang-dev; drop the bare libyang
  entry.

Part of sonic-net/sonic-buildimage#22385.

Signed-off-by: Brad House <bhouse@nexthop.ai>
---
 .azure-pipelines/build.yml            | 4 ++--
 .github/workflows/codeql-analysis.yml | 5 +----
 lgtm.yml                              | 1 -
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.azure-pipelines/build.yml b/.azure-pipelines/build.yml
index 4057671..b0a3224 100644
--- a/.azure-pipelines/build.yml
+++ b/.azure-pipelines/build.yml
@@ -76,8 +76,8 @@ jobs:
       ${{ else }}:
         artifact: common-lib.${{ parameters.arch }}
       patterns: |
-        target/debs/bookworm/libyang-*_1.0*.deb
-        target/debs/bookworm/libyang_1.0*.deb
+        target/debs/bookworm/libyang3_*.deb
+        target/debs/bookworm/libyang-dev_3*.deb
     displayName: "Download libyang from common lib"
   - script: |
       set -ex
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index bbba819..df951c9 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -48,6 +48,7 @@ jobs:
             libnl-route-3-dev \
             libnl-nf-3-dev \
             libnl-genl-3-dev \
+            libyang-dev \
             libgmock-dev \
             dh-exec \
             swig \
@@ -77,13 +78,9 @@ jobs:
           curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libnl-genl-3-dev_3.7.0-0.2%2Bb1sonic1_amd64.deb" -o libnl-genl-3-dev_3.7.0-0.2+b1sonic1_amd64.deb
           curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libnl-nf-3-200_3.7.0-0.2%2Bb1sonic1_amd64.deb" -o libnl-nf-3-200_3.7.0-0.2+b1sonic1_amd64.deb
           curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libnl-nf-3-dev_3.7.0-0.2%2Bb1sonic1_amd64.deb" -o libnl-nf-3-dev_3.7.0-0.2+b1sonic1_amd64.deb
-          curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libyang_1.0.73_amd64.deb" -o libyang_1.0.73_amd64.deb
-          curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libyang-cpp_1.0.73_amd64.deb" -o llibyang-cpp_1.0.73_amd64.deb
-          curl -L "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&target=target/debs/bookworm/libyang-dev_1.0.73_amd64.deb" -o libyang-dev_1.0.73_amd64.deb
           dpkg-deb -x libswsscommon_1.0.0_amd64.deb $(dirname $GITHUB_WORKSPACE)
           dpkg-deb -x libswsscommon-dev_1.0.0_amd64.deb $(dirname $GITHUB_WORKSPACE)
           dpkg -i libnl*.deb
-          dpkg -i libyang*.deb
 
       - name: build
         run: |
diff --git a/lgtm.yml b/lgtm.yml
index 2deaff7..b3c340b 100644
--- a/lgtm.yml
+++ b/lgtm.yml
@@ -15,7 +15,6 @@ extraction:
       - "swig3.0"
       - "uuid-dev"
       - "libzmq3-dev"
-      - "libyang"
       - "libyang-dev"
     after_prepare:
     - "git clone https://github.com/Azure/sonic-swss-common; pushd sonic-swss-common; ./autogen.sh; fakeroot dpkg-buildpackage -us -uc -b; popd"