diff options
| -rw-r--r-- | healthcheck/docker/Dockerfile | 11 | ||||
| -rw-r--r-- | infra-healthcheck/docker/Dockerfile | 4 | ||||
| -rw-r--r-- | security/docker/Dockerfile | 12 | ||||
| -rw-r--r-- | smoke-usecases-pythonsdk/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | smoke-usecases-robot-py3/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | smoke-usecases-robot/docker/Dockerfile | 11 |
6 files changed, 23 insertions, 19 deletions
diff --git a/healthcheck/docker/Dockerfile b/healthcheck/docker/Dockerfile index 60422ef..34015ea 100644 --- a/healthcheck/docker/Dockerfile +++ b/healthcheck/docker/Dockerfile @@ -1,9 +1,10 @@ FROM opnfv/xtesting:jerma -ARG OPENSTACK_TAG=master +ARG OPENSTACK_TAG=stable/wallaby ARG PIP_TAG=20.1 -ARG OPNFV_TAG=master -ARG ONAP_TAG=master +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 24fa61d..4535dd1 100644 --- a/infra-healthcheck/docker/Dockerfile +++ b/infra-healthcheck/docker/Dockerfile @@ -3,8 +3,8 @@ FROM opnfv/xtesting:wallaby ARG KUBERNETES_VERSION="v1.19.11" ARG HELM_VERSION="v2.16.6" ARG HELM3_VERSION="v3.3.4" -ARG ONAP_TESTS_TAG=master -ARG ONAP_TAG=master +ARG ONAP_TESTS_TAG=istanbul +ARG ONAP_TAG=istanbul ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1 diff --git a/security/docker/Dockerfile b/security/docker/Dockerfile index 9bfd2cc..3808865 100644 --- a/security/docker/Dockerfile +++ b/security/docker/Dockerfile @@ -19,8 +19,9 @@ RUN CGO_ENABLED=0 go install -a -ldflags '-w -s -extldflags "-static"' FROM opnfv/xtesting:wallaby AS run ARG KUBERNETES_VERSION="v1.19.11" -ARG ONAP_TAG=master -ARG ONAP_TESTS_TAG=master +ARG ONAP_TAG=istanbul +ARG ONAP_TESTS_TAG=istanbul +ARG PIP_TAG=20.1 # Install kubectl # Note: Latest version may be found on: @@ -59,12 +60,13 @@ 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 && \ + 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 diff --git a/smoke-usecases-pythonsdk/docker/Dockerfile b/smoke-usecases-pythonsdk/docker/Dockerfile index 696862a..a501ff5 100644 --- a/smoke-usecases-pythonsdk/docker/Dockerfile +++ b/smoke-usecases-pythonsdk/docker/Dockerfile @@ -2,7 +2,7 @@ FROM opnfv/xtesting:wallaby MAINTAINER Morgan Richomme <morgan.richomme@orange.com> -ARG ONAP_TESTS_TAG=master +ARG ONAP_TESTS_TAG=istanbul ARG ONAPSDK_PYTHON_PATH=/src/onapsdk ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1 diff --git a/smoke-usecases-robot-py3/docker/Dockerfile b/smoke-usecases-robot-py3/docker/Dockerfile index 1caf0f5..1686b95 100644 --- a/smoke-usecases-robot-py3/docker/Dockerfile +++ b/smoke-usecases-robot-py3/docker/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Morgan Richomme <morgan.richomme@orange.com> ARG OPENSTACK_TAG=master ARG OPNFV_TAG=master -ARG ONAP_TAG=master +ARG ONAP_TAG=istanbul ARG PIP_TAG=21.2.4 ARG KUBERNETES_VERSION="v1.19.9" diff --git a/smoke-usecases-robot/docker/Dockerfile b/smoke-usecases-robot/docker/Dockerfile index 6ed527d..695a93b 100644 --- a/smoke-usecases-robot/docker/Dockerfile +++ b/smoke-usecases-robot/docker/Dockerfile @@ -2,9 +2,10 @@ FROM opnfv/xtesting:jerma MAINTAINER Morgan Richomme <morgan.richomme@orange.com> -ARG OPENSTACK_TAG=master -ARG OPNFV_TAG=master -ARG ONAP_TAG=master +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 \ |