From b5cf388fee35abcc3a1b199c54626239468ddc5a Mon Sep 17 00:00:00 2001 From: bingwang Date: Fri, 4 Oct 2024 21:31:25 +0000 Subject: [PATCH 1/2] Skip installing python-setuptools for bookworm --- tests/copp/copp_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/copp/copp_utils.py b/tests/copp/copp_utils.py index 9b294cac79..c7aafcf974 100644 --- a/tests/copp/copp_utils.py +++ b/tests/copp/copp_utils.py @@ -214,14 +214,14 @@ def _install_nano_bookworm(dut, creds, syncd_docker_name): && rm -rf /var/lib/apt/lists/* \ && apt-get update \ && apt-get install -y python3-pip build-essential libssl-dev libffi-dev \ - python3-dev python-setuptools wget libnanomsg-dev python-is-python3 \ + python3-dev wget libnanomsg-dev python-is-python3 \ && pip3 install cffi==1.16.0 && pip3 install nnpy \ && mkdir -p /opt && cd /opt && wget \ https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \ && mkdir ptf && cd ptf && wget \ https://raw.githubusercontent.com/p4lang/ptf/master/src/ptf/afpacket.py && touch __init__.py \ && apt-get -y purge build-essential libssl-dev libffi-dev python3-dev \ - python-setuptools wget \ + wget \ " '''.format(http_proxy, https_proxy, syncd_docker_name) dut.command(cmd) From 7c449203a04dc216f7b75f88c113455a47d52d36 Mon Sep 17 00:00:00 2001 From: bingwang Date: Fri, 4 Oct 2024 21:44:19 +0000 Subject: [PATCH 2/2] Change package name --- tests/copp/copp_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/copp/copp_utils.py b/tests/copp/copp_utils.py index c7aafcf974..3d39cfc8cd 100644 --- a/tests/copp/copp_utils.py +++ b/tests/copp/copp_utils.py @@ -214,14 +214,14 @@ def _install_nano_bookworm(dut, creds, syncd_docker_name): && rm -rf /var/lib/apt/lists/* \ && apt-get update \ && apt-get install -y python3-pip build-essential libssl-dev libffi-dev \ - python3-dev wget libnanomsg-dev python-is-python3 \ + python3-dev python3-setuptools wget libnanomsg-dev python-is-python3 \ && pip3 install cffi==1.16.0 && pip3 install nnpy \ && mkdir -p /opt && cd /opt && wget \ https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \ && mkdir ptf && cd ptf && wget \ https://raw.githubusercontent.com/p4lang/ptf/master/src/ptf/afpacket.py && touch __init__.py \ && apt-get -y purge build-essential libssl-dev libffi-dev python3-dev \ - wget \ + python3-setuptools wget \ " '''.format(http_proxy, https_proxy, syncd_docker_name) dut.command(cmd)