Skip to content

Commit

Permalink
[code sync] Merge code from sonic-net/sonic-sairedis:202411 to 202412 (
Browse files Browse the repository at this point in the history
…#15)

```<br>* 97bc0de0 - (HEAD -> 202412) Merge branch '202411' of https://github.com/sonic-net/sonic-sairedis into 202412 (2025-02-20) [Sonic Automation]
* ec8b3c3 - (origin/202411) Fix pipeline errors related to rsyslogd and libswsscommon installation (sonic-net#1535) (2025-02-19) [mssonicbld]
* 6b263b8 - [FC] Support Policer Counter (sonic-net#1533) (2025-02-19) [mssonicbld]
* e53489e - [syncd] Update log level for bulk api (sonic-net#1532) (2025-02-18) [Jianyue Wu]
* 7ae00e5 - Define bulk chunk size and bulk chunk size per counter ID (sonic-net#1528) (2025-02-11) [mssonicbld]
* f35e743 - [nvidia] Skip SAI discovery on ports (sonic-net#1524) (2025-02-07) [mssonicbld]
* bf049ed - Use sonictest pool instead of sonic-common and fix arm64 issue. (sonic-net#1516) (2025-02-05) [mssonicbld]
* ffe371d - [syncd] Support bulk set in INIT_VIEW mode (sonic-net#1517) (2025-02-05) [mssonicbld]<br>```
  • Loading branch information
mssonicbld authored Feb 20, 2025
1 parent 2045c50 commit 058ed4c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
5 changes: 5 additions & 0 deletions .azure-pipelines/build-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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) }}:
Expand Down
8 changes: 4 additions & 4 deletions .azure-pipelines/test-docker-sonic-vs-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 058ed4c

Please sign in to comment.