Skip to content

Commit d0ec8b0

Browse files
authored
Merge pull request #216 from ranjinidn/sonic-gnmi_bookworm_migration
Bookworm migration for all dependency packages in azurepipeline for sonic-gnmi
2 parents 3363587 + 8e3f408 commit d0ec8b0

File tree

4 files changed

+72
-155
lines changed

4 files changed

+72
-155
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ endif
127127
sudo CGO_LDFLAGS="$(CGO_LDFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" $(GO) test -race -coverprofile=coverage-data.txt -covermode=atomic -mod=vendor -v github.com/sonic-net/sonic-gnmi/sonic_data_client
128128
sudo CGO_LDFLAGS="$(CGO_LDFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" $(GO) test -race -coverprofile=coverage-dbus.txt -covermode=atomic -mod=vendor -v github.com/sonic-net/sonic-gnmi/sonic_service_client
129129
sudo CGO_LDFLAGS="$(CGO_LDFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" $(TESTENV) $(GO) test -race -coverprofile=coverage-translutils.txt -covermode=atomic -mod=vendor -v github.com/sonic-net/sonic-gnmi/transl_utils
130-
$(GO) get github.com/axw/gocov/...
131-
$(GO) get github.com/AlekSi/gocov-xml
130+
$(GO) install github.com/axw/gocov/gocov@latest
131+
$(GO) install github.com/AlekSi/gocov-xml@latest
132132
$(GO) mod vendor
133133
gocov convert coverage-*.txt | gocov-xml -source $(shell pwd) > coverage.xml
134134
rm -rf coverage-*.txt

azure-pipelines.yml

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ stages:
5353
DIFF_COVER_WORKING_DIRECTORY: $(System.DefaultWorkingDirectory)/sonic-gnmi
5454

5555
container:
56-
image: sonicdev-microsoft.azurecr.io:443/sonic-slave-bullseye:latest
56+
image: sonicdev-microsoft.azurecr.io:443/sonic-slave-bookworm:latest
5757

5858
steps:
5959
- checkout: self
@@ -80,10 +80,12 @@ stages:
8080
runVersion: 'latestFromBranch'
8181
runBranch: 'refs/heads/$(BUILD_BRANCH)'
8282
patterns: |
83-
target/debs/bullseye/libyang*.deb
84-
target/debs/bullseye/libnl*.deb
85-
target/python-wheels/bullseye/sonic_yang_models*.whl
86-
displayName: "Download bullseye debs"
83+
target/debs/bookworm/libyang*.deb
84+
target/debs/bookworm/libnl*.deb
85+
target/debs/bookworm/libswsscommon*.deb
86+
target/debs/bookworm/python3-swsscommon*.deb
87+
target/python-wheels/bookworm/sonic_yang_models*.whl
88+
displayName: "Download bookworm debs"
8789

8890
- script: |
8991
# PYTEST
@@ -98,50 +100,38 @@ stages:
98100
sudo service redis-server start
99101
100102
# LIBYANG
101-
sudo dpkg -i ../target/debs/bullseye/libyang*1.0.73*.deb
103+
sudo dpkg -i ../target/debs/bookworm/libyang*1.0.73*.deb
102104
displayName: "Install dependency"
103105
104106
- script: |
105107
# SONIC YANGS
106108
set -ex
107-
sudo pip3 install ../target/python-wheels/bullseye/sonic_yang_models-1.0-py3-none-any.whl
109+
sudo pip3 install ../target/python-wheels/bookworm/sonic_yang_models-1.0-py3-none-any.whl
108110
displayName: "Install sonic yangs"
109111
110112
- script: |
111113
# LIBSWSSCOMMON
112114
sudo apt-get -y purge libnl-3-dev libnl-route-3-dev
113-
sudo dpkg -i ../target/debs/bullseye/libnl-3-200_*.deb
114-
sudo dpkg -i ../target/debs/bullseye/libnl-genl-3-200_*.deb
115-
sudo dpkg -i ../target/debs/bullseye/libnl-route-3-200_*.deb
116-
sudo dpkg -i ../target/debs/bullseye/libnl-nf-3-200_*.deb
115+
sudo dpkg -i ../target/debs/bookworm/libnl-3-200_*.deb
116+
sudo dpkg -i ../target/debs/bookworm/libnl-genl-3-200_*.deb
117+
sudo dpkg -i ../target/debs/bookworm/libnl-route-3-200_*.deb
118+
sudo dpkg -i ../target/debs/bookworm/libnl-nf-3-200_*.deb
117119
displayName: "Install libswsscommon dependencies"
118120
119121
- script: |
120122
set -ex
121123
# Install .NET CORE
122124
curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
123-
sudo apt-add-repository https://packages.microsoft.com/debian/11/prod
125+
sudo apt-add-repository https://packages.microsoft.com/debian/12/prod
124126
sudo apt-get update
125-
sudo apt-get install -y dotnet-sdk-5.0
127+
sudo apt-get install -y dotnet-sdk-7.0
126128
displayName: "Install .NET CORE"
127129
128-
- task: DownloadPipelineArtifact@2
129-
inputs:
130-
source: specific
131-
project: build
132-
pipeline: Azure.sonic-swss-common
133-
artifact: sonic-swss-common
134-
runVersion: 'latestFromBranch'
135-
runBranch: 'refs/heads/$(BUILD_BRANCH)'
136-
displayName: "Download sonic-swss-common"
137-
138130
- script: |
139-
set -ex
140131
# LIBSWSSCOMMON
141-
sudo dpkg -i libswsscommon_1.0.0_amd64.deb
142-
sudo dpkg -i libswsscommon-dev_1.0.0_amd64.deb
143-
sudo dpkg -i python3-swsscommon_1.0.0_amd64.deb
144-
workingDirectory: $(Pipeline.Workspace)/
132+
sudo dpkg -i ../target/debs/bookworm/libswsscommon_1.0.0_amd64.deb
133+
sudo dpkg -i ../target/debs/bookworm/libswsscommon-dev_1.0.0_amd64.deb
134+
sudo dpkg -i ../target/debs/bookworm/python3-swsscommon_1.0.0_amd64.deb
145135
displayName: 'Install libswsscommon package'
146136
147137
- script: |

go.mod

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/sonic-net/sonic-gnmi
22

3-
go 1.15
3+
go 1.19
44

55
require (
66
github.com/Azure/sonic-mgmt-common v0.0.0-00010101000000-000000000000
@@ -19,19 +19,35 @@ require (
1919
github.com/jipanyang/gnxi v0.0.0-20181221084354-f0a90cca6fd0
2020
github.com/kylelemons/godebug v1.1.0
2121
github.com/msteinert/pam v0.0.0-20201130170657-e61372126161
22-
github.com/onsi/ginkgo v1.10.3 // indirect
23-
github.com/onsi/gomega v1.7.1 // indirect
2422
github.com/openconfig/gnmi v0.0.0-20200617225440-d2b4e6a45802
2523
github.com/openconfig/gnoi v0.0.0-20201210212451-209899112bb7
2624
github.com/openconfig/ygot v0.7.1
27-
github.com/stretchr/testify v1.4.0 // indirect
2825
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
2926
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
3027
google.golang.org/grpc v1.33.2
3128
google.golang.org/protobuf v1.25.0
3229
gopkg.in/yaml.v2 v2.2.8
3330
)
3431

32+
require (
33+
github.com/antchfx/jsonquery v1.1.4 // indirect
34+
github.com/antchfx/xmlquery v1.3.1 // indirect
35+
github.com/antchfx/xpath v1.1.10 // indirect
36+
github.com/bgentry/speakeasy v0.1.0 // indirect
37+
github.com/cenkalti/backoff/v4 v4.0.0 // indirect
38+
github.com/go-redis/redis/v7 v7.0.0-beta.3.0.20190824101152-d19aba07b476 // indirect
39+
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
40+
github.com/google/go-cmp v0.5.0 // indirect
41+
github.com/maruel/natural v1.1.1 // indirect
42+
github.com/onsi/ginkgo v1.10.3 // indirect
43+
github.com/onsi/gomega v1.7.1 // indirect
44+
github.com/openconfig/goyang v0.0.0-20200309174518-a00bece872fc // indirect
45+
github.com/philopon/go-toposort v0.0.0-20170620085441-9be86dbd762f // indirect
46+
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac // indirect
47+
golang.org/x/text v0.3.3 // indirect
48+
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
49+
)
50+
3551
replace github.com/Azure/sonic-mgmt-common => ../sonic-mgmt-common
3652

3753
replace github.com/openconfig/gnoi => github.com/openconfig/gnoi v0.0.0-20201210212451-209899112bb7

0 commit comments

Comments
 (0)