From 20fedefbde0e267d0058a424935d9d441de63137 Mon Sep 17 00:00:00 2001 From: "Richard.Yu" Date: Thu, 17 Nov 2022 12:28:30 +0800 Subject: [PATCH] [sai-ptf]Fix sai ptf issue (#12723) * fix sai-ptf build issue caused by upgraded scapy in base ptf docker Signed-off-by: richardyu-ms * remove useless change Signed-off-by: richardyu-ms * reformat code Signed-off-by: richardyu-ms Signed-off-by: richardyu-ms --- dockers/docker-ptf-sai/Dockerfile.j2 | 3 +-- platform/vs/docker-ptf-sai.mk | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dockers/docker-ptf-sai/Dockerfile.j2 b/dockers/docker-ptf-sai/Dockerfile.j2 index d68b39abb0..269eb109ca 100644 --- a/dockers/docker-ptf-sai/Dockerfile.j2 +++ b/dockers/docker-ptf-sai/Dockerfile.j2 @@ -16,7 +16,6 @@ RUN pip3 install crc16 \ getmac \ packet_helper \ psutil \ - scapy==2.4.4 \ scapy_helper \ pysubnettree \ xmlrunner @@ -24,7 +23,7 @@ RUN pip3 install crc16 \ COPY \ {% for deb in docker_ptf_sai_debs.split(' ') -%} debs/{{ deb }}{{' '}} -{%- endfor -%} +{%- endfor -%} debs/ RUN dpkg -i \ diff --git a/platform/vs/docker-ptf-sai.mk b/platform/vs/docker-ptf-sai.mk index d3463c5a09..17fce00c1f 100644 --- a/platform/vs/docker-ptf-sai.mk +++ b/platform/vs/docker-ptf-sai.mk @@ -3,7 +3,7 @@ DOCKER_PTF_SAI = docker-ptf-sai.gz DOCKER_PTF_BASE = docker-ptf.gz $(DOCKER_PTF_SAI)_PATH = $(DOCKERS_PATH)/docker-ptf-sai -$(DOCKER_PTF_SAI)_DEPENDS += $(LIBTHRIFT_2) $(PYTHON3_THRIFT_2) +$(DOCKER_PTF_SAI)_DEPENDS += $(LIBTHRIFT_0_14_1) $(PYTHON3_THRIFT_0_14_1) $(DOCKER_PTF_SAI)_LOAD_DOCKERS += $(DOCKER_PTF_BASE) SONIC_DOCKER_IMAGES += $(DOCKER_PTF_SAI) SONIC_BUSTER_DOCKERS += $(DOCKER_PTF_SAI)