diff options
| author |   morganrol <morgan.richomme@orange.com> | 2022-01-24 08:50:47 +0100 |
|---|---|---|
| committer | morganrol <morgan.richomme@orange.com> | 2022-01-24 09:13:13 +0100 |
| commit | 0b2c4b4d1f9520596cd920b4e2926ec3b6dc6682 (patch) | |
| tree | b6c04085c69e0bfe372818363127630ba4b276bb | |
| parent | 82cf909a6d3949ed3c6af47ecb9f3a1dd367dd30 (diff) | |
[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
| -rw-r--r-- | infra-healthcheck/docker/Dockerfile | 6 | ||||
| -rw-r--r-- | security/docker/Dockerfile | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/infra-healthcheck/docker/Dockerfile b/infra-healthcheck/docker/Dockerfile index ad0520c..7bec902 100644 --- 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 --- 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 |