diff options
| -rw-r--r-- | healthcheck/docker/Dockerfile | 5 | ||||
| -rw-r--r-- | infra-healthcheck/docker/Dockerfile | 5 | ||||
| -rw-r--r-- | security/docker/Dockerfile | 5 | ||||
| -rw-r--r-- | smoke-usecases-robot/docker/Dockerfile | 5 |
4 files changed, 12 insertions, 8 deletions
diff --git a/healthcheck/docker/Dockerfile b/healthcheck/docker/Dockerfile index c450bc9..34015ea 100644 --- a/healthcheck/docker/Dockerfile +++ b/healthcheck/docker/Dockerfile @@ -4,6 +4,7 @@ ARG OPENSTACK_TAG=stable/wallaby ARG PIP_TAG=20.1 ARG OPNFV_TAG=stable/jerma ARG ONAP_TAG=istanbul +ARG ARCHIVED_ONAP_TAG=master ENV PYTHONPATH $PYTHONPATH:/src/testing-utils/robotframework-onap/eteutils ENV TAG all @@ -16,8 +17,8 @@ RUN apk --no-cache add --update openssl chromium chromium-chromedriver && \ openssl-dev libjpeg-turbo-dev && \ pip3 install --upgrade pip && \ pip3 install --no-cache-dir \ - git+https://git.onap.org/testsuite/heatbridge.git@$ONAP_TAG#egg=heatbridge\&subdirectory=heatbridge \ - git+https://git.onap.org/testsuite/python-testing-utils.git@$ONAP_TAG#egg=robotframework-onap\&subdirectory=robotframework-onap && \ + git+https://git.onap.org/testsuite/heatbridge.git@$ARCHIVED_ONAP_TAG#egg=heatbridge\&subdirectory=heatbridge \ + git+https://git.onap.org/testsuite/python-testing-utils.git@$ARCHIVED_ONAP_TAG#egg=robotframework-onap\&subdirectory=robotframework-onap && \ git clone --depth 1 https://git.onap.org/testsuite -b $ONAP_TAG /var/opt/ONAP && \ git clone --depth 1 https://git.onap.org/demo -b $ONAP_TAG /src/demo && \ pip install \ diff --git a/infra-healthcheck/docker/Dockerfile b/infra-healthcheck/docker/Dockerfile index 4535dd1..ad0520c 100644 --- a/infra-healthcheck/docker/Dockerfile +++ b/infra-healthcheck/docker/Dockerfile @@ -5,6 +5,7 @@ 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 @@ -28,8 +29,8 @@ 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 --upgrade pip && \ - pip3 install --no-cache-dir -r upper-constraints.txt && \ + 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 && \ pip3 install --no-cache-dir \ diff --git a/security/docker/Dockerfile b/security/docker/Dockerfile index 3b09f2c..edd331b 100644 --- a/security/docker/Dockerfile +++ b/security/docker/Dockerfile @@ -21,6 +21,7 @@ FROM opnfv/xtesting:wallaby AS run ARG KUBERNETES_VERSION="v1.19.11" ARG ONAP_TAG=istanbul ARG ONAP_TESTS_TAG=istanbul +ARG PIP_TAG=20.1 # Install kubectl # Note: Latest version may be found on: @@ -59,9 +60,9 @@ RUN set -x && \ chmod +x /usr/local/bin/sslendpoints && \ chmod +x /check_*.sh && \ rm -rf /usr/lib/python3.8/site-packages/PyYAML* && \ - pip3 install --upgrade pip && \ pip3 install --no-cache-dir \ - git+https://git.onap.org/integration/xtesting.git@$ONAP_TESTS_TAG#subdirectory=security && \ + git+https://git.onap.org/integration/xtesting.git@$ONAP_TESTS_TAG#subdirectory=security \ + 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 && \ diff --git a/smoke-usecases-robot/docker/Dockerfile b/smoke-usecases-robot/docker/Dockerfile index c1c412e..695a93b 100644 --- a/smoke-usecases-robot/docker/Dockerfile +++ b/smoke-usecases-robot/docker/Dockerfile @@ -5,6 +5,7 @@ MAINTAINER Morgan Richomme <morgan.richomme@orange.com> ARG OPENSTACK_TAG=stable/wallaby ARG OPNFV_TAG=stable/jerma ARG ONAP_TAG=istanbul +ARG ARCHIVED_ONAP_TAG=master ARG PIP_TAG=20.1 ARG KUBERNETES_VERSION="v1.19.9" ARG HELM_VERSION="v3.3.4" @@ -27,8 +28,8 @@ RUN apk --no-cache add --update openssl chromium chromium-chromedriver && \ chmod +x /usr/local/bin/kubectl && \ pip3 install --upgrade pip && \ pip3 install --no-cache-dir \ - git+https://git.onap.org/testsuite/heatbridge.git@$ONAP_TAG#egg=heatbridge\&subdirectory=heatbridge \ - git+https://git.onap.org/testsuite/python-testing-utils.git@$ONAP_TAG#egg=robotframework-onap\&subdirectory=robotframework-onap && \ + git+https://git.onap.org/testsuite/heatbridge.git@$ARCHIVED_ONAP_TAG#egg=heatbridge\&subdirectory=heatbridge \ + git+https://git.onap.org/testsuite/python-testing-utils.git@$ARCHIVED_ONAP_TAG#egg=robotframework-onap\&subdirectory=robotframework-onap && \ git clone --depth 1 https://git.onap.org/testsuite -b $ONAP_TAG /var/opt/ONAP && \ git clone --depth 1 https://git.onap.org/demo -b $ONAP_TAG /src/demo && \ pip install \ |