Merge branch 'master' into revert_4f7eed0

sonic-net · Jan 30, 2025 · d0d20bb · d0d20bb
2 parents f37d164 + d3b2503
commit d0d20bb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
@@ -164,8 +164,13 @@ jobs:
       mv ../*.deb .
     displayName: "Compile sonic sairedis with coverage enabled"
   - script: |
+      set -ex
       sudo cp azsyslog.conf /etc/rsyslog.conf
+      cat /run/rsyslogd.pid
       sudo pkill -F /run/rsyslogd.pid
+      # Looks like arm64 (and sometimes amd64) rsyslogd needs some time to exit
+      sleep 2
+      ps -ef
       sudo rsyslogd
     displayName: "Update rsyslog.conf"
   - ${{ if eq(parameters.run_unit_test, true) }}:

diff --git a/.azure-pipelines/test-docker-sonic-vs-template.yml b/.azure-pipelines/test-docker-sonic-vs-template.yml
@@ -27,7 +27,9 @@ jobs:
 
   steps:
   - script: |
+      set -ex
       ls -A1 | xargs -I{} sudo rm -rf {}
+      sudo apt-get purge libswsscommon python3-swsscommon || true
     displayName: "Clean workspace"
   - checkout: self
     clean: true
@@ -73,10 +75,8 @@ jobs:
 
       sudo apt-get update
       sudo apt-get install -y libhiredis0.14 libyang0.16
-      sudo dpkg -i $(Build.ArtifactStagingDirectory)/download/libprotobuf*_amd64.deb $(Build.ArtifactStagingDirectory)/download/libprotobuf-lite*_amd64.deb $(Build.ArtifactStagingDirectory)/download/python3-protobuf*_amd64.deb
-      sudo dpkg -i $(Build.ArtifactStagingDirectory)/download/libdashapi*.deb
-      sudo dpkg -i --force-confask,confnew $(Build.ArtifactStagingDirectory)/download/libswsscommon_1.0.0_amd64.deb || apt-get install -f
-      sudo dpkg -i $(Build.ArtifactStagingDirectory)/download/python3-swsscommon_1.0.0_amd64.deb
+      sudo apt install -y $(Build.ArtifactStagingDirectory)/download/libprotobuf*_amd64.deb $(Build.ArtifactStagingDirectory)/download/libprotobuf-lite*_amd64.deb $(Build.ArtifactStagingDirectory)/download/python3-protobuf*_amd64.deb
+      sudo apt install -y $(Build.ArtifactStagingDirectory)/download/libdashapi*.deb $(Build.ArtifactStagingDirectory)/download/libswsscommon_1.0.0_amd64.deb $(Build.ArtifactStagingDirectory)/download/python3-swsscommon_1.0.0_amd64.deb
 
       # install packages for vs test
       sudo apt-get install -y net-tools bridge-utils vlan