Skip to content

Commit ec8b3c3

Browse files
authored
Fix pipeline errors related to rsyslogd and libswsscommon installation (#1535)
On arm64 (and maybe sometimes amd64), rsyslogd appears to need a second or two to actually fully exit. The current code expects it to exit practically instantly. Add a sleep of 2 seconds to give it some time. Also enable some logging so that the commands being run can be seen. Also, fix an error related to libswsscommon not getting installed due to new dependencies being added. Solve this by using apt install to install the package, which brings in any necessary dependencies.
1 parent 6b263b8 commit ec8b3c3

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

.azure-pipelines/build-template.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,13 @@ jobs:
164164
mv ../*.deb .
165165
displayName: "Compile sonic sairedis with coverage enabled"
166166
- script: |
167+
set -ex
167168
sudo cp azsyslog.conf /etc/rsyslog.conf
169+
cat /run/rsyslogd.pid
168170
sudo pkill -F /run/rsyslogd.pid
171+
# Looks like arm64 (and sometimes amd64) rsyslogd needs some time to exit
172+
sleep 2
173+
ps -ef
169174
sudo rsyslogd
170175
displayName: "Update rsyslog.conf"
171176
- ${{ if eq(parameters.run_unit_test, true) }}:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ jobs:
2727

2828
steps:
2929
- script: |
30+
set -ex
3031
ls -A1 | xargs -I{} sudo rm -rf {}
32+
sudo apt-get purge libswsscommon python3-swsscommon || true
3133
displayName: "Clean workspace"
3234
- checkout: self
3335
clean: true
@@ -73,10 +75,8 @@ jobs:
7375
7476
sudo apt-get update
7577
sudo apt-get install -y libhiredis0.14 libyang0.16
76-
sudo dpkg -i $(Build.ArtifactStagingDirectory)/download/libprotobuf*_amd64.deb $(Build.ArtifactStagingDirectory)/download/libprotobuf-lite*_amd64.deb $(Build.ArtifactStagingDirectory)/download/python3-protobuf*_amd64.deb
77-
sudo dpkg -i $(Build.ArtifactStagingDirectory)/download/libdashapi*.deb
78-
sudo dpkg -i --force-confask,confnew $(Build.ArtifactStagingDirectory)/download/libswsscommon_1.0.0_amd64.deb || apt-get install -f
79-
sudo dpkg -i $(Build.ArtifactStagingDirectory)/download/python3-swsscommon_1.0.0_amd64.deb
78+
sudo apt install -y $(Build.ArtifactStagingDirectory)/download/libprotobuf*_amd64.deb $(Build.ArtifactStagingDirectory)/download/libprotobuf-lite*_amd64.deb $(Build.ArtifactStagingDirectory)/download/python3-protobuf*_amd64.deb
79+
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
8080
8181
# install packages for vs test
8282
sudo apt-get install -y net-tools bridge-utils vlan

0 commit comments

Comments
 (0)