[ISTANBUL] Fix docker builds

As tags have been removed version 1.9.1 of security package is not
needed anymore
Check cert needs cryptography that needs more recent depenencies.

Issue-ID: INT-2044

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

diff --git a/infra-healthcheck/docker/Dockerfile b/infra-healthcheck/docker/Dockerfile
index 7bec902..4535dd1 100644 (file)
--- a/infra-healthcheck/docker/Dockerfile
+++ b/infra-healthcheck/docker/Dockerfile
@@ -5,7 +5,6 @@ ARG HELM_VERSION="v2.16.6"
 ARG HELM3_VERSION="v3.3.4"
 ARG ONAP_TESTS_TAG=istanbul
 ARG ONAP_TAG=istanbul
-ARG PIP_TAG=20.1
 
 ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
 
@@ -29,14 +28,12 @@ RUN set -x && \
     chmod +x /usr/local/bin/helm && \
     chmod +x /usr/local/bin/helm3 && \
     rm -rf /usr/lib/python3.8/site-packages/PyYAML* && \
-    pip3 install --no-cache-dir -r upper-constraints.txt \
-        pip==$PIP_TAG && \
+    pip3 install --upgrade pip && \
+    pip3 install --no-cache-dir -r upper-constraints.txt && \
     pip3 install --no-cache-dir \
-        git+https://git.onap.org/integration/xtesting.git@$ONAP_TESTS_TAG#subdirectory=infra-healthcheck \
-        pip==$PIP_TAG && \
+        git+https://git.onap.org/integration/xtesting.git@$ONAP_TESTS_TAG#subdirectory=infra-healthcheck && \
     pip3 install --no-cache-dir \
-        git+https://git.onap.org/integration.git@$ONAP_TESTS_TAG#subdirectory=test/security/check_certificates \
-        pip==$PIP_TAG && \
+        git+https://git.onap.org/integration.git@$ONAP_TESTS_TAG#subdirectory=test/security/check_certificates && \
     apk del .build-deps
 
 COPY docker/testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml

diff --git a/security/setup.cfg b/security/setup.cfg
index a71889e..61fe7fa 100644 (file)
--- a/security/setup.cfg
+++ b/security/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = onap_security
-version = 1.9.0
+version = 1
 
 [files]
 packages = onap_security