From c8003a936ce3e96399fbe43f4e3948e5d9967d36 Mon Sep 17 00:00:00 2001 From: zhangjing Date: Fri, 8 Apr 2022 22:33:26 +0000 Subject: [PATCH 1/6] remove dh-systemd --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 83bb1a5b..c7f13e15 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,6 @@ Section: devel Priority: optional Maintainer: Tamer Ahmed 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 From a632f284488f41d02d13abfc71f98d14ae132a4a Mon Sep 17 00:00:00 2001 From: zhangjing Date: Fri, 8 Apr 2022 23:26:19 +0000 Subject: [PATCH 2/6] update azp, remove hard coded dependencies --- azure-pipelines.yml | 6 +++--- debian/control | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8553a260..2455deb9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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: | @@ -98,7 +98,7 @@ 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: | @@ -162,7 +162,7 @@ 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: | diff --git a/debian/control b/debian/control index c7f13e15..0c05609d 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,5 @@ 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) From fd680d2d5f4288dfcd0d5c18de28ed7480fed777 Mon Sep 17 00:00:00 2001 From: zhangjing Date: Fri, 8 Apr 2022 23:50:13 +0000 Subject: [PATCH 3/6] update azp --- azure-pipelines.yml | 115 ++++++++++++++++++++++---------------------- 1 file changed, 58 insertions(+), 57 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2455deb9..301c23f3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,7 +20,7 @@ jobs: vmImage: 'ubuntu-20.04' container: - image: sonicdev-microsoft.azurecr.io:443/sonic-slave-bullseye:latest + image: sonicdev-microsoft.azurecr.io:443/sonic-slave-buster:latest steps: - script: | @@ -32,27 +32,27 @@ 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 update + sudo apt-get install -y --fix-broken\ + 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 \ @@ -98,30 +98,30 @@ jobs: timeoutInMinutes: 180 pool: sonicbld-arm64 container: - image: sonicdev-microsoft.azurecr.io:443/sonic-slave-bullseye-arm64:latest + image: sonicdev-microsoft.azurecr.io:443/sonic-slave-buster-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 update + sudo apt-get install -y --fix-broken\ + 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 \ @@ -162,30 +162,31 @@ jobs: timeoutInMinutes: 180 pool: sonicbld-armhf container: - image: sonicdev-microsoft.azurecr.io:443/sonic-slave-bullseye-armhf:latest + image: sonicdev-microsoft.azurecr.io:443/sonic-slave-buster-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 \ + sudo apt-get update + sudo apt-get clean + sudo apt-get install -y --fix-broken\ + 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 \ From b516f005570ece59122ee7f2d746ea19d3f6878c Mon Sep 17 00:00:00 2001 From: zhangjing Date: Sun, 10 Apr 2022 20:55:51 +0000 Subject: [PATCH 4/6] try dist-upgrade and dpkg config --- azure-pipelines.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 301c23f3..c5be1910 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -33,6 +33,7 @@ jobs: displayName: install .Net - script: | sudo apt-get update + sudo dpkg --configure -a sudo apt-get install -y --fix-broken\ libboost-dev \ libboost-program-options-dev \ @@ -103,6 +104,7 @@ jobs: steps: - script: | sudo apt-get update + sudo apt-get dist-upgrade -y sudo apt-get install -y --fix-broken\ libboost-dev \ libboost-program-options-dev \ @@ -166,8 +168,9 @@ jobs: steps: - script: | - sudo apt-get update - sudo apt-get clean + sudo apt-get update + sudo dpkg --configure -a + sudo apt-get dist-upgrade -y sudo apt-get install -y --fix-broken\ libboost-dev \ libboost-program-options-dev \ From ad5fb6a96e2359a460028f9dc5972277a0f16a81 Mon Sep 17 00:00:00 2001 From: zhangjing Date: Sun, 10 Apr 2022 21:09:11 +0000 Subject: [PATCH 5/6] accidentally revert image changes --- azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c5be1910..ed458125 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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: | @@ -99,7 +99,7 @@ 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: | @@ -164,7 +164,7 @@ 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: | From 5cd897d58c34d66b911c700ed921bd1f52ea8c2b Mon Sep 17 00:00:00 2001 From: zhangjing Date: Sun, 10 Apr 2022 21:38:21 +0000 Subject: [PATCH 6/6] try with removing dist-upgrade, ---fix-broken, dpgk config --- azure-pipelines.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ed458125..5e6fae6b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -32,9 +32,7 @@ jobs: sudo apt-get install -y dotnet-sdk-6.0 displayName: install .Net - script: | - sudo apt-get update - sudo dpkg --configure -a - sudo apt-get install -y --fix-broken\ + sudo apt-get install -y\ libboost-dev \ libboost-program-options-dev \ libboost-system-dev \ @@ -103,9 +101,7 @@ jobs: steps: - script: | - sudo apt-get update - sudo apt-get dist-upgrade -y - sudo apt-get install -y --fix-broken\ + sudo apt-get install -y\ libboost-dev \ libboost-program-options-dev \ libboost-system-dev \ @@ -168,10 +164,7 @@ jobs: steps: - script: | - sudo apt-get update - sudo dpkg --configure -a - sudo apt-get dist-upgrade -y - sudo apt-get install -y --fix-broken\ + sudo apt-get install -y \ libboost-dev \ libboost-program-options-dev \ libboost-system-dev \