diff --git a/dockers/docker-ptf-sai/Dockerfile.j2 b/dockers/docker-ptf-sai/Dockerfile.j2 index f42d04c1cd..fda64eacf5 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 @@ -34,7 +33,7 @@ debs/{{ deb }}{{' '}} # Remove old ptf package RUN dpkg -r python-ptf -# Install new ptf package -RUN git clone https://github.com/p4lang/ptf.git \ - && cd ptf \ - && python3.7 setup.py install --single-version-externally-managed --record /tmp/ptf_install.txt +# Install new ptf package not supprt in 202012 branch +# RUN git clone https://github.com/p4lang/ptf.git \ +# && cd ptf \ +# && python3.7 setup.py install --single-version-externally-managed --record /tmp/ptf_install.txt diff --git a/platform/vs/docker-ptf-sai.mk b/platform/vs/docker-ptf-sai.mk index d3463c5a09..1a1480bf09 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_13_0) $(PYTHON3_THRIFT_0_13_0) $(DOCKER_PTF_SAI)_LOAD_DOCKERS += $(DOCKER_PTF_BASE) SONIC_DOCKER_IMAGES += $(DOCKER_PTF_SAI) -SONIC_BUSTER_DOCKERS += $(DOCKER_PTF_SAI) +SONIC_STRETCH_DOCKERS += $(DOCKER_PTF_SAI)