[PIP] Use 20.1 pip version for istanbul xtesting dockers

Using pip > 20.1 leads to docker build issues as
tags are controlled through pbr.
git history requires a target version of pbr.version.SemanticVersion(1.9.1),
but target version is pbr.version.SemanticVersion(1.0.0)

quick fix consist in setting the version 20.1 for istanbul branch
successfully tested in healthcheck
applied here to infra healthcheck and security

Issue-ID: INT-2044

Signed-off-by: morganrol <morgan.richomme@orange.com>
Change-Id: Iafe462766b2f4014a007e928520bf4fb47000feb

diff --git a/infra-healthcheck/docker/Dockerfile b/infra-healthcheck/docker/Dockerfile
index ad0520c..7bec902 100644 (file)
--- a/infra-healthcheck/docker/Dockerfile
+++ b/infra-healthcheck/docker/Dockerfile
@@ -32,9 +32,11 @@ RUN set -x && \
     pip3 install --no-cache-dir -r upper-constraints.txt \
         pip==$PIP_TAG && \
     pip3 install --no-cache-dir \
-        git+https://git.onap.org/integration/xtesting.git@$ONAP_TESTS_TAG#subdirectory=infra-healthcheck && \
+        git+https://git.onap.org/integration/xtesting.git@$ONAP_TESTS_TAG#subdirectory=infra-healthcheck \
+        pip==$PIP_TAG && \
     pip3 install --no-cache-dir \
-        git+https://git.onap.org/integration.git@$ONAP_TESTS_TAG#subdirectory=test/security/check_certificates && \
+        git+https://git.onap.org/integration.git@$ONAP_TESTS_TAG#subdirectory=test/security/check_certificates \
+        pip==$PIP_TAG && \
     apk del .build-deps
 
 COPY docker/testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml

diff --git a/security/docker/Dockerfile b/security/docker/Dockerfile
index edd331b..3808865 100644 (file)
--- a/security/docker/Dockerfile
+++ b/security/docker/Dockerfile
@@ -65,7 +65,8 @@ RUN set -x && \
         pip==$PIP_TAG && \
     cd /kube-hunter && pip3 install -r /kube-hunter/requirements.txt && \
     pip3 install --no-cache-dir \
-        git+https://gitlab.com/Orange-OpenSource/lfn/onap/integration/onap-version-status.git && \
+        git+https://gitlab.com/Orange-OpenSource/lfn/onap/integration/onap-version-status.git \
+        pip==$PIP_TAG && \
     apk del .build-deps
 
 COPY docker/testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml