Fix CVE PROD-37203
Change-Id: Iae0eaf540e6333196a8048361932368ccbcc68df
diff --git a/Dockerfile b/Dockerfile
index a61bf23..dc9361a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,11 +30,12 @@
popd ;
RUN apt-get update && apt-get upgrade -y && \
apt-get install -y build-essential curl git-core iputils-ping libffi-dev libldap2-dev libsasl2-dev libssl-dev patch vim-tiny wget \
- python2.7 python2.7-dev python3.8 python3.8-dev python3-pip \
-# Due to upstream bug we should use fixed version of pip
- && pip3 install -U pip==20.0.2 \
- && pip3 install tox==3.25.1 virtualenv==20.21.0
- # initialize cvp stacklight test suite
+ python2.7 python2.7-dev python3.8 python3.8-dev python3-pip \
+ && pip install --upgrade pip setuptools>=65.5.1 wheel>=0.38.0 \
+ && apt-mark manual python3 python3-pip \
+ # tox==3.25.1 the latest version which supports python2.7 properly
+ # the same for virtualenv==20.21.0
+ && pip install -U tox==3.25.1 virtualenv==20.21.0
RUN tox --recreate \
# Cleanup
&& apt-get -y purge libx11-data xauth libxmuu1 libxcb1 libx11-6 libxext6 ppp pppconfig pppoeconf popularity-contest cpp gcc g++ libssl-doc && \
diff --git a/test_set/tox.ini b/test_set/tox.ini
index 41069b3..60ffc08 100644
--- a/test_set/tox.ini
+++ b/test_set/tox.ini
@@ -1,27 +1,40 @@
[tox]
envlist = cvp-sanity,cvp-spt,cvp-stacklight
skipsdist = TRUE
-deps = pip==20.0.2
- virtualenv==20.21.0
- setuptools
- wheel
[testenv]
passenv = *
commands = {posargs:pytest --version}
+download = true
+deps3 =
+ pip==21.1
+ virtualenv==20.21
+ setuptools==65.5.1
+ wheel==0.38.0
+deps27 =
+ pip==20.3.4
+ virtualenv==20.15.1
+ setuptools==44.1.1
+ wheel==0.37.1
[testenv:cvp-sanity]
basepython = python3.8
-deps = -rcvp-sanity/requirements.txt
+deps =
+ {[testenv]deps3}
+ -rcvp-sanity/requirements.txt
changedir = cvp-sanity
[testenv:cvp-spt]
basepython=python2.7
-deps = -rcvp-spt/requirements.txt
+deps =
+ {[testenv]deps27}
+ -rcvp-spt/requirements.txt
changedir = cvp-spt
[testenv:cvp-stacklight]
basepython=python2.7
install_command = python -m pip install cvp-stacklight/ {packages}
-deps = -rcvp-stacklight/requirements.txt
+deps =
+ {[testenv]deps27}
+ -rcvp-stacklight/requirements.txt
changedir = cvp-stacklight