diff options
-rw-r--r-- | benchmarking/docker/Dockerfile | 4 | ||||
-rw-r--r-- | candidate-usecases/docker/Dockerfile | 2 | ||||
-rw-r--r-- | healthcheck/docker/Dockerfile | 8 | ||||
-rw-r--r-- | infra-healthcheck/docker/Dockerfile | 2 | ||||
-rw-r--r-- | security/docker/Dockerfile | 4 | ||||
-rw-r--r-- | smoke-usecases-pythonsdk/docker/Dockerfile | 2 | ||||
-rw-r--r-- | smoke-usecases-robot/docker/Dockerfile | 8 |
7 files changed, 15 insertions, 15 deletions
diff --git a/benchmarking/docker/Dockerfile b/benchmarking/docker/Dockerfile index 1f2d1cf..4206b4c 100644 --- a/benchmarking/docker/Dockerfile +++ b/benchmarking/docker/Dockerfile @@ -2,7 +2,7 @@ FROM opnfv/xtesting ARG OPENSTACK_TAG=master ARG OPNFV_TAG=master ARG ONAP_TAG=master -ARG PIP_TAG=19.3 +ARG PIP_TAG=19.3.1 ENV PYTHONPATH $PYTHONPATH:/src/testing-utils/robotframework-onap/eteutils ENV TAG all @@ -28,6 +28,6 @@ RUN apk --no-cache add --virtual .build-deps --update \ cd / && ln -s /var/opt/ONAP/robot/ /robot && \ apk del .build-deps -COPY docker/testcases.yaml /usr/lib/python3.6/site-packages/xtesting/ci/testcases.yaml +COPY docker/testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml COPY scripts/cmd.sh / CMD ["/cmd.sh"] diff --git a/candidate-usecases/docker/Dockerfile b/candidate-usecases/docker/Dockerfile index ec7acf0..b6dae67 100644 --- a/candidate-usecases/docker/Dockerfile +++ b/candidate-usecases/docker/Dockerfile @@ -12,5 +12,5 @@ RUN apk add --no-cache python3 git bash && \ git+https://gitlab.com/Orange-OpenSource/onap-tests.git@$ONAP_TESTS_TAG#egg=onap_tests && \ apk del .build-deps -COPY docker/testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml +COPY docker/testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/healthcheck/docker/Dockerfile b/healthcheck/docker/Dockerfile index d631129..6496a70 100644 --- a/healthcheck/docker/Dockerfile +++ b/healthcheck/docker/Dockerfile @@ -3,7 +3,7 @@ FROM opnfv/xtesting ARG OPENSTACK_TAG=master ARG OPNFV_TAG=master ARG ONAP_TAG=master -ARG PIP_TAG=18.0 +ARG PIP_TAG=19.3.1 ENV PYTHONPATH $PYTHONPATH:/src/testing-utils/robotframework-onap/eteutils ENV TAG all @@ -28,12 +28,12 @@ RUN apk --no-cache add --update openssl && \ mkdir -p /var/opt/ONAP/demo/heat && cp -Rf /src/demo/heat/vFW /var/opt/ONAP/demo/heat/ && \ mkdir -p /demo/service_mapping && cp -Rf /src/demo/service_mapping /demo/ && \ mkdir -p /var/opt/ONAP/demo/preload_data && cp -Rf /src/demo/preload_data /var/opt/ONAP/demo/ && \ - ln -s /usr/lib/python3.7/site-packages/vcpeutils /usr/lib/python3.7/site-packages/SoUtils && \ - ln -s /usr/lib/python3.7/site-packages/heatbridge /usr/lib/python3.7/site-packages/HeatBridge && \ + ln -s /usr/lib/python3.8/site-packages/vcpeutils /usr/lib/python3.8/site-packages/SoUtils && \ + ln -s /usr/lib/python3.8/site-packages/heatbridge /usr/lib/python3.8/site-packages/HeatBridge && \ rm -r requirements.txt /var/opt/ONAP/.git /src/demo && \ cd / && ln -s /var/opt/ONAP/robot/ /robot && \ apk del .build-deps -COPY docker/testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml +COPY docker/testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml COPY scripts/cmd.sh / CMD ["/cmd.sh"] diff --git a/infra-healthcheck/docker/Dockerfile b/infra-healthcheck/docker/Dockerfile index de19a2a..849268c 100644 --- a/infra-healthcheck/docker/Dockerfile +++ b/infra-healthcheck/docker/Dockerfile @@ -27,5 +27,5 @@ RUN set -x && \ git+https://gitlab.com/Orange-OpenSource/lfn/onap/integration/xtesting.git@$ONAP_TESTS_TAG#subdirectory=infra-healthcheck && \ apk del .build-deps -COPY docker/testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml +COPY docker/testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/security/docker/Dockerfile b/security/docker/Dockerfile index fe7997b..667900f 100644 --- a/security/docker/Dockerfile +++ b/security/docker/Dockerfile @@ -1,12 +1,12 @@ FROM opnfv/xtesting ARG ONAP_TAG=master -ARG PIP_TAG=18.0 +ARG PIP_TAG=19.3.1 COPY requirements.txt requirements.txt RUN apk --no-cache add --virtual .build-deps --update \ openssl-dev libjpeg-turbo-dev && \ apk del .build-deps -COPY docker/testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml +COPY docker/testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml CMD ["run_test -t all -r"] diff --git a/smoke-usecases-pythonsdk/docker/Dockerfile b/smoke-usecases-pythonsdk/docker/Dockerfile index ec7acf0..b6dae67 100644 --- a/smoke-usecases-pythonsdk/docker/Dockerfile +++ b/smoke-usecases-pythonsdk/docker/Dockerfile @@ -12,5 +12,5 @@ RUN apk add --no-cache python3 git bash && \ git+https://gitlab.com/Orange-OpenSource/onap-tests.git@$ONAP_TESTS_TAG#egg=onap_tests && \ apk del .build-deps -COPY docker/testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml +COPY docker/testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/smoke-usecases-robot/docker/Dockerfile b/smoke-usecases-robot/docker/Dockerfile index d470cf1..38616aa 100644 --- a/smoke-usecases-robot/docker/Dockerfile +++ b/smoke-usecases-robot/docker/Dockerfile @@ -5,7 +5,7 @@ MAINTAINER Morgan Richomme <morgan.richomme@orange.com> ARG OPENSTACK_TAG=master ARG OPNFV_TAG=master ARG ONAP_TAG=master -ARG PIP_TAG=19.3 +ARG PIP_TAG=19.3.1 ENV TAG all @@ -28,12 +28,12 @@ RUN apk --no-cache add --virtual .build-deps --update \ mkdir -p /var/opt/ONAP/demo/heat && cp -Rf /src/demo/heat/vFW /var/opt/ONAP/demo/heat/ && \ mkdir -p /demo/service_mapping && cp -Rf /src/demo/service_mapping /demo/ && \ mkdir -p /var/opt/ONAP/demo/preload_data && cp -Rf /src/demo/preload_data /var/opt/ONAP/demo/ && \ - ln -s /usr/lib/python3.7/site-packages/vcpeutils /usr/lib/python3.7/site-packages/SoUtils && \ - ln -s /usr/lib/python3.7/site-packages/heatbridge /usr/lib/python3.7/site-packages/HeatBridge && \ + ln -s /usr/lib/python3.8/site-packages/vcpeutils /usr/lib/python3.8/site-packages/SoUtils && \ + ln -s /usr/lib/python3.8/site-packages/heatbridge /usr/lib/python3.8/site-packages/HeatBridge && \ rm -r requirements.txt /var/opt/ONAP/.git /src/demo && \ cd / && ln -s /var/opt/ONAP/robot/ /robot && \ apk del .build-deps -COPY docker/testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml +COPY docker/testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml COPY scripts/cmd.sh / CMD ["/cmd.sh"] |