Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated SAI version to Oct 20, 2023 #231

Merged
merged 2 commits into from
Nov 17, 2023
Merged

Updated SAI version to Oct 20, 2023 #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49c7ffc
Updated SAI version to Oct 20, 2023
andriy-kokhan Nov 17, 2023
e6166d4
Fixed swss-common dependencies
andriy-kokhan Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dockerfiles/bullseye/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ RUN apt-get install -y \
make libtool m4 autoconf dh-exec debhelper automake cmake pkg-config \
libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev swig \
libgtest-dev libgmock-dev libboost-dev autoconf-archive \
uuid-dev libboost-serialization-dev libyang-dev libyang1
uuid-dev libboost-serialization-dev libyang-dev libyang1 \
nlohmann-json3-dev

RUN apt-get install -y \
libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libnl-nf-3-dev libzmq3-dev
Expand Down Expand Up @@ -98,7 +99,6 @@ RUN echo "#mock" > /ptf/ptf && pip3 install /ptf

# Install SAI attributes metadata JSON generator
COPY scripts/gen_attr_list /sai/gen_attr_list
RUN apt-get install -y nlohmann-json3-dev

# Install SAI-C dependencies
RUN pip3 install pytest pytest_dependency pytest-html aenum pdbpp macaddress click==8.0
Expand Down
6 changes: 3 additions & 3 deletions dockerfiles/buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@ RUN apt-get install -y redis-server libhiredis0.14 libc-ares2
# Install sonic-swss-common & sonic-sairedis building dependencies
RUN apt-get install -y \
make libtool m4 autoconf dh-exec debhelper automake cmake pkg-config \
libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev swig3.0 \
libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev swig \
libgtest-dev libgmock-dev libboost-dev autoconf-archive \
uuid-dev libboost-serialization-dev libyang-dev libyang1
uuid-dev libboost-serialization-dev libyang-dev libyang1 \
nlohmann-json3-dev

RUN apt-get install -y \
libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libnl-nf-3-dev libzmq3-dev
Expand Down Expand Up @@ -104,7 +105,6 @@ RUN echo "#mock" > /ptf/ptf && pip3 install /ptf

# Install SAI attributes metadata JSON generator
COPY scripts/gen_attr_list /sai/gen_attr_list
RUN apt-get install -y nlohmann-json3-dev

# Install SAI-C dependencies
RUN pip3 install pytest pytest_dependency pytest-html aenum pdbpp macaddress click==8.0
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/buster/Dockerfile.server
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN apt-get install -y redis-server libhiredis0.14 libc-ares2
# Install sonic-swss-common & sonic-sairedis building dependencies
RUN apt-get install -y \
make libtool m4 autoconf dh-exec debhelper automake cmake pkg-config \
libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev swig3.0 \
libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev swig \
libgtest-dev libgmock-dev libboost-dev autoconf-archive \
uuid-dev libboost-serialization-dev libyang-dev libyang1 \
nlohmann-json3-dev
Expand Down
12 changes: 6 additions & 6 deletions sai.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# The sonic-swss-common and sonic-sairedis commits were taken from
# sonic-buildimage master as of Sep 29, 2023
# sonic-buildimage master as of Nov 17, 2023
#
# https://github.com/sonic-net/sonic-buildimage/tree/81a2f56
# https://github.com/sonic-net/sonic-buildimage/tree/9f08f88

SWSS_COMMON_ID=b0f148e
SAIREDIS_ID=c22b76b
SWSS_COMMON_ID=05e024e
SAIREDIS_ID=92da5b3

# SAI version:
# Branch master (post v1.13)
# Sep 8, 2023
# Oct 20, 2023

SAI_ID=7f7a758
SAI_ID=f981a1f