Skip to content

Commit

Permalink
Upgrade linkmgrd to BULLSEYE (#60)
Browse files Browse the repository at this point in the history
### Description of PR
Summary:
Fixes # (issue)

This PR is to upgrade linkmgrd to base image `BULLSEYE`. What is changed: 
1. Removing `dh-systemd`
The dependency on `dh-systemd` is blocking upgrading docker-mux to `bullseye` (sonic-net/sonic-buildimage#10498). Removing it now to unblock. 
1. Azure pipeline change
1. Replace dependency list with ${shlibs:Depends}

sign-off: Jing Zhang zhangjing@microsoft.com

#### How did you verify/test it?
Test building locally.
  • Loading branch information
zjswhhh authored Apr 11, 2022
1 parent 2fc890e commit 41f5fb9
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 61 deletions.
109 changes: 53 additions & 56 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
vmImage: 'ubuntu-20.04'

container:
image: sonicdev-microsoft.azurecr.io:443/sonic-slave-buster:latest
image: sonicdev-microsoft.azurecr.io:443/sonic-slave-bullseye:latest

steps:
- script: |
Expand All @@ -32,27 +32,26 @@ jobs:
sudo apt-get install -y dotnet-sdk-6.0
displayName: install .Net
- script: |
sudo apt-get install -y \
libboost1.71-dev \
libboost-program-options1.71-dev \
libboost-system1.71-dev \
libboost-thread1.71-dev \
libboost-atomic1.71-dev \
libboost-chrono1.71-dev \
libboost-container1.71-dev \
libboost-context1.71-dev \
libboost-contract1.71-dev \
libboost-coroutine1.71-dev \
libboost-date-time1.71-dev \
libboost-fiber1.71-dev \
libboost-filesystem1.71-dev \
libboost-graph-parallel1.71-dev \
libboost-log1.71-dev \
libboost-regex1.71-dev \
sudo apt-get install -y\
libboost-dev \
libboost-program-options-dev \
libboost-system-dev \
libboost-thread-dev \
libboost-atomic-dev \
libboost-chrono-dev \
libboost-container-dev \
libboost-context-dev \
libboost-contract-dev \
libboost-coroutine-dev \
libboost-date-time-dev \
libboost-fiber-dev \
libboost-filesystem-dev \
libboost-graph-parallel-dev \
libboost-log-dev \
libboost-regex-dev \
googletest \
libgtest-dev \
libgmock-dev \
libgcc-8-dev \
libhiredis0.14 \
libhiredis-dev \
libnl-3-dev \
Expand Down Expand Up @@ -98,30 +97,29 @@ jobs:
timeoutInMinutes: 180
pool: sonicbld-arm64
container:
image: sonicdev-microsoft.azurecr.io:443/sonic-slave-buster-arm64:latest
image: sonicdev-microsoft.azurecr.io:443/sonic-slave-bullseye-arm64:latest

steps:
- script: |
sudo apt-get install -y \
libboost1.71-dev \
libboost-program-options1.71-dev \
libboost-system1.71-dev \
libboost-thread1.71-dev \
libboost-atomic1.71-dev \
libboost-chrono1.71-dev \
libboost-container1.71-dev \
libboost-context1.71-dev \
libboost-contract1.71-dev \
libboost-coroutine1.71-dev \
libboost-date-time1.71-dev \
libboost-fiber1.71-dev \
libboost-filesystem1.71-dev \
libboost-graph-parallel1.71-dev \
libboost-log1.71-dev \
libboost-regex1.71-dev \
sudo apt-get install -y\
libboost-dev \
libboost-program-options-dev \
libboost-system-dev \
libboost-thread-dev \
libboost-atomic-dev \
libboost-chrono-dev \
libboost-container-dev \
libboost-context-dev \
libboost-contract-dev \
libboost-coroutine-dev \
libboost-date-time-dev \
libboost-fiber-dev \
libboost-filesystem-dev \
libboost-graph-parallel-dev \
libboost-log-dev \
libboost-regex-dev \
googletest \
libgtest-dev \
libgcc-8-dev \
libhiredis0.14 \
libhiredis-dev \
libnl-3-dev \
Expand Down Expand Up @@ -162,30 +160,29 @@ jobs:
timeoutInMinutes: 180
pool: sonicbld-armhf
container:
image: sonicdev-microsoft.azurecr.io:443/sonic-slave-buster-armhf:latest
image: sonicdev-microsoft.azurecr.io:443/sonic-slave-bullseye-armhf:latest

steps:
- script: |
sudo apt-get install -y \
libboost1.71-dev \
libboost-program-options1.71-dev \
libboost-system1.71-dev \
libboost-thread1.71-dev \
libboost-atomic1.71-dev \
libboost-chrono1.71-dev \
libboost-container1.71-dev \
libboost-context1.71-dev \
libboost-contract1.71-dev \
libboost-coroutine1.71-dev \
libboost-date-time1.71-dev \
libboost-fiber1.71-dev \
libboost-filesystem1.71-dev \
libboost-graph-parallel1.71-dev \
libboost-log1.71-dev \
libboost-regex1.71-dev \
libboost-dev \
libboost-program-options-dev \
libboost-system-dev \
libboost-thread-dev \
libboost-atomic-dev \
libboost-chrono-dev \
libboost-container-dev \
libboost-context-dev \
libboost-contract-dev \
libboost-coroutine-dev \
libboost-date-time-dev \
libboost-fiber-dev \
libboost-filesystem-dev \
libboost-graph-parallel-dev \
libboost-log-dev \
libboost-regex-dev \
googletest \
libgtest-dev \
libgcc-8-dev \
libhiredis0.14 \
libhiredis-dev \
libnl-3-dev \
Expand Down
6 changes: 1 addition & 5 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,12 @@ Section: devel
Priority: optional
Maintainer: Tamer Ahmed <tamer.ahmed@microsoft.com>
Build-Depends: debhelper (>= 8.0.0),
dh-systemd
Standards-Version: 3.9.3
Homepage: https://github.com/Azure/sonic-linkmgrd
XS-Go-Import-Path: github.com/Azure/sonic-linkmgrd

Package: sonic-linkmgrd
Architecture: any
Built-Using: ${misc:Built-Using}
Depends: libboost-program-options1.71.0,
libboost-thread1.71.0,
libboost-date-time1.71.0,
libboost-log1.71.0
Depends: ${shlibs:Depends}
Description: SONiC LINK ManaGeR Daemon (linkmgrd)

0 comments on commit 41f5fb9

Please sign in to comment.