matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[Nvidia] Update syncd docker to use python version 3 (#17735)

Browse Source 
* Remove python2 from compilation of python-sdk-api

* Upgrade Python version in syncd RPC docker image to Python3
This commit is contained in:
Lior Avramov 2024-01-30 23:47:39 +02:00 committed by mssonicbld
parent 6b8549c3bb
commit 4599f7aeaf
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
View File

@ -1,5 +1,5 @@
## ##
## Copyright (c) 2016-2021 NVIDIA CORPORATION & AFFILIATES. ## Copyright (c) 2016-2024 NVIDIA CORPORATION & AFFILIATES.
## Apache-2.0 ## Apache-2.0
## ##
## Licensed under the Apache License, Version 2.0 (the "License"); ## Licensed under the Apache License, Version 2.0 (the "License");
@ -28,20 +28,24 @@ RUN apt-get purge -y syncd
RUN apt-get update \ RUN apt-get update \
&& apt-get -y install \ && apt-get -y install \
net-tools \ net-tools \
python-setuptools \
build-essential \ build-essential \
libssl-dev \ libssl-dev \
libffi-dev \ libffi-dev \
python-dev \
wget \ wget \
cmake \ cmake \
libqt5core5a \ libqt5core5a \
libqt5network5 \ libqt5network5 \
libboost-atomic1.74.0 libboost-atomic1.74.0 \
python3-pip \
python3-dev \
python-is-python3 \
python3-setuptools
RUN pip3 install --upgrade pip
# Build and install python-scapy # Build and install python-scapy
RUN curl http://ftp.us.debian.org/debian/pool/main/s/scapy/python-scapy_2.4.0-2_all.deb --output python-scapy_2.4.0-2_all.deb \ RUN curl http://ftp.us.debian.org/debian/pool/main/s/scapy/python3-scapy_2.4.0-2_all.deb --output python3-scapy_2.4.0-2_all.deb \
&& dpkg -i python-scapy_2.4.0-2_all.deb \ && dpkg -i python3-scapy_2.4.0-2_all.deb \
&& apt install -f && apt install -f
{% if docker_syncd_mlnx_rpc_debs.strip() -%} {% if docker_syncd_mlnx_rpc_debs.strip() -%}
@ -64,10 +68,6 @@ RUN curl http://ftp.us.debian.org/debian/pool/main/s/scapy/python-scapy_2.4.0-2_
{{ install_debian_packages(docker_syncd_mlnx_rpc_pydebs.split(' ')) }} {{ install_debian_packages(docker_syncd_mlnx_rpc_pydebs.split(' ')) }}
{% endif %} {% endif %}
# Install pip2 since it is no longer in the APT upstream
RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py \
&& python2 get-pip.py
RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \ RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
&& tar xvfz 1.0.0.tar.gz \ && tar xvfz 1.0.0.tar.gz \
&& cd nanomsg-1.0.0 \ && cd nanomsg-1.0.0 \
@ -78,10 +78,10 @@ RUN wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
&& cd .. \ && cd .. \
&& rm -fr nanomsg-1.0.0 \ && rm -fr nanomsg-1.0.0 \
&& rm -f 1.0.0.tar.gz \ && rm -f 1.0.0.tar.gz \
&& pip2 install cffi==1.7.0 \ && pip3 install cffi==1.16.0 \
&& pip2 install --upgrade cffi==1.7.0 \ && pip3 install wheel \
&& pip2 install wheel \ && pip3 install nnpy \
&& pip2 install nnpy \ && pip3 install ptf \
&& mkdir -p /opt \ && mkdir -p /opt \
&& cd /opt \ && cd /opt \
&& wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \ && wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \

2
platform/mellanox/docker-syncd-mlnx-rpc/ptf_nn_agent.conf
View File

@ -1,5 +1,5 @@
[program:ptf_nn_agent] [program:ptf_nn_agent]
command=/usr/bin/python2 /opt/ptf_nn_agent.py --device-socket 1@tcp://0.0.0.0:10900 -i 1-3@Ethernet12 --set-nn-rcv-buffer=109430400 --set-iface-rcv-buffer=109430400 --set-nn-snd-buffer=109430400 --set-iface-snd-buffer=109430400 command=/usr/bin/python3 /opt/ptf_nn_agent.py --device-socket 1@tcp://0.0.0.0:10900 -i 1-3@Ethernet12 --set-nn-rcv-buffer=109430400 --set-iface-rcv-buffer=109430400 --set-nn-snd-buffer=109430400 --set-iface-snd-buffer=109430400
process_name=ptf_nn_agent process_name=ptf_nn_agent
stdout_logfile=/tmp/ptf_nn_agent.out.log stdout_logfile=/tmp/ptf_nn_agent.out.log
stderr_logfile=/tmp/ptf_nn_agent.err.log stderr_logfile=/tmp/ptf_nn_agent.err.log

2
platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
View File

@ -1,5 +1,5 @@
## ##
## Copyright (c) 2016-2021 NVIDIA CORPORATION & AFFILIATES. ## Copyright (c) 2016-2024 NVIDIA CORPORATION & AFFILIATES.
## Apache-2.0 ## Apache-2.0
## ##
## Licensed under the Apache License, Version 2.0 (the "License"); ## Licensed under the Apache License, Version 2.0 (the "License");

2
platform/mellanox/sdk-src/python-sdk-api/Makefile
View File

@ -18,7 +18,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
./autogen.sh ./autogen.sh
fi fi
debuild -e PYTHON_INTERPRETERS="\"python2 python3\"" -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) debuild -e PYTHON_INTERPRETERS="\"python3\"" -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
popd popd