Skip to content

Commit 8a7379c

Browse files
authored
Install libyang in azure pipeline. (sonic-net#1124)
#### Why I did it sonic-swss-common lib will add depency to libyang soon, so need install libyang lib to prevent build and UT break. #### How I did it Modify azure pipeline to install libyang in azure pipeline steps. #### How to verify it Pass all UT. #### Which release branch to backport (provide reason below if selected) #### Description for the changelog Modify azure pipeline to install libyang in azure pipeline steps. #### Link to config_db schema for YANG module changes #### A picture of a cute animal (not mandatory but encouraged)
1 parent c4d6621 commit 8a7379c

File tree

4 files changed

+42
-1
lines changed

4 files changed

+42
-1
lines changed

.azure-pipelines/build-swss-template.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,13 @@ jobs:
108108
target/debs/${{ parameters.debian_version }}/libnl-genl*.deb
109109
target/debs/${{ parameters.debian_version }}/libnl-route*.deb
110110
target/debs/${{ parameters.debian_version }}/libnl-nf*.deb
111+
target/debs/${{ parameters.debian_version }}/libyang_*.deb
111112
displayName: "Download common libs"
112113

113114
- script: |
114115
set -ex
116+
# install libyang before install libswsscommon
117+
sudo dpkg -i $(find ./download -name libyang_*.deb)
115118
sudo dpkg -i $(find ./download -name *.deb)
116119
rm -rf download || true
117120
workingDirectory: $(Build.ArtifactStagingDirectory)

.azure-pipelines/build-template.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ parameters:
3939
type: boolean
4040
default: false
4141

42+
- name: debian_version
43+
type: string
44+
4245
jobs:
4346
- job:
4447
displayName: ${{ parameters.arch }}
@@ -94,6 +97,38 @@ jobs:
9497
sudo service rsyslog start
9598
9699
displayName: "Install dependencies"
100+
- task: DownloadPipelineArtifact@2
101+
# amd64 artifact name does not has arch suffix
102+
condition: eq('${{ parameters.arch }}', 'amd64')
103+
inputs:
104+
source: specific
105+
project: build
106+
pipeline: Azure.sonic-buildimage.common_libs
107+
runVersion: 'latestFromBranch'
108+
runBranch: 'refs/heads/$(BUILD_BRANCH)'
109+
path: $(Build.ArtifactStagingDirectory)/download
110+
artifact: common-lib
111+
patterns: |
112+
target/debs/${{ parameters.debian_version }}/libyang_*.deb
113+
displayName: "Download libyang from amd64 common lib"
114+
- task: DownloadPipelineArtifact@2
115+
condition: ne('${{ parameters.arch }}', 'amd64')
116+
inputs:
117+
source: specific
118+
project: build
119+
pipeline: Azure.sonic-buildimage.common_libs
120+
runVersion: 'latestFromBranch'
121+
runBranch: 'refs/heads/$(BUILD_BRANCH)'
122+
path: $(Build.ArtifactStagingDirectory)/download
123+
artifact: common-lib.${{ parameters.arch }}
124+
patterns: |
125+
target/debs/${{ parameters.debian_version }}/libyang_*.deb
126+
displayName: "Download libyang from common lib"
127+
- script: |
128+
set -ex
129+
sudo dpkg -i $(find ./download -name *.deb)
130+
workingDirectory: $(Build.ArtifactStagingDirectory)
131+
displayName: "Install libyang from common lib"
97132
- task: DownloadPipelineArtifact@2
98133
inputs:
99134
source: specific

.azure-pipelines/test-docker-sonic-vs-template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
set -ex
4949
sudo sonic-sairedis/.azure-pipelines/build_and_install_module.sh
5050
51-
sudo apt-get install -y libhiredis0.14
51+
sudo apt-get install -y libhiredis0.14 libyang0.16
5252
sudo dpkg -i --force-confask,confnew $(Build.ArtifactStagingDirectory)/download/libswsscommon_1.0.0_amd64.deb || apt-get install -f
5353
sudo dpkg -i $(Build.ArtifactStagingDirectory)/download/python3-swsscommon_1.0.0_amd64.deb
5454

azure-pipelines.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ stages:
5858
syslog_artifact_name: sonic-sairedis.syslog
5959
run_unit_test: true
6060
archive_gcov: true
61+
debian_version: ${{ parameters.debian_version }}
6162

6263
- stage: BuildArm
6364
dependsOn: Build
@@ -72,6 +73,7 @@ stages:
7273
swss_common_artifact_name: sonic-swss-common.armhf
7374
artifact_name: sonic-sairedis.armhf
7475
syslog_artifact_name: sonic-sairedis.syslog.armhf
76+
debian_version: ${{ parameters.debian_version }}
7577

7678
- template: .azure-pipelines/build-template.yml
7779
parameters:
@@ -82,6 +84,7 @@ stages:
8284
swss_common_artifact_name: sonic-swss-common.arm64
8385
artifact_name: sonic-sairedis.arm64
8486
syslog_artifact_name: sonic-sairedis.syslog.arm64
87+
debian_version: ${{ parameters.debian_version }}
8588

8689
- stage: BuildSwss
8790
dependsOn: Build

0 commit comments

Comments
 (0)