FIX PIP requirement packages

+ CSIT will only use packages installed from master
  PIP requirement.txt file
+ All CSIT subsequent code must use single function
  and PIP list for virtualenv
- Report/PAL/doc/trending will follow in next patch

Change-Id: Ia9150fb05a144182a5a163178d553370ede55cdd
Signed-off-by: Peter Mikus <pmikus@cisco.com>

2 files changed, 2 insertions, 17 deletions

diff --git a/resources/tools/disk-image-builder/csit-sut/Dockerfile b/resources/tools/disk-image-builder/csit-sut/Dockerfile
index ba212dc960..aa5ddf288d 100644
--- a/resources/tools/disk-image-builder/csit-sut/Dockerfile
+++ b/resources/tools/disk-image-builder/csit-sut/Dockerfile
@@ -14,7 +14,7 @@
 FROM ubuntu:18.04
 MAINTAINER csit-dev <csit-dev@lists.fd.io>
 LABEL Description="CSIT vpp-device ubuntu 18.04 SUT image"
-LABEL Version="0.7"
+LABEL Version="1.0"
 
 # Setup the environment
 ENV DEBIAN_FRONTEND=noninteractive
@@ -57,7 +57,6 @@ RUN apt-get -q update \
         python-cffi \
         python-cffi-backend \
         python-dev \
-        python-enum34 \
         python-pip \
         python-setuptools \
         python-virtualenv \
@@ -115,6 +114,7 @@ RUN pip3 install \
         scapy==2.4.3 \
         scp==0.13.2 \
         ansible==2.7.8 \
+        ply==3.11 \
         dill==0.2.8.2 \
         numpy==1.17.3 \
         hdrhistogram==0.6.1 \
diff --git a/resources/tools/scripts/perpatch_requirements.txt b/resources/tools/scripts/perpatch_requirements.txt
deleted file mode 100644
index 2275fb82f2..0000000000
--- a/resources/tools/scripts/perpatch_requirements.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# TODO: Ply should be installed as system package, fix bootstrap to see it.
-ply==3.11