diff options
| -rw-r--r-- | infra-healthcheck/docker/Dockerfile | 21 | ||||
| -rw-r--r-- | smoke-usecases-pythonsdk/docker/Dockerfile | 9 |
2 files changed, 14 insertions, 16 deletions
diff --git a/infra-healthcheck/docker/Dockerfile b/infra-healthcheck/docker/Dockerfile index 9cab01d..311edf7 100644 --- a/infra-healthcheck/docker/Dockerfile +++ b/infra-healthcheck/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/xtesting:wallaby +FROM python:3.11-alpine ARG KUBERNETES_VERSION="v1.19.11" ARG HELM_VERSION="v2.16.6" @@ -18,7 +18,7 @@ ADD https://storage.googleapis.com/kubernetes-release/release/${KUBERNETES_VERSI COPY . . RUN set -x && \ - apk --no-cache add --update curl ca-certificates && \ + apk --no-cache add --update git curl ca-certificates && \ apk --no-cache add --virtual .build-deps --update \ gcc python3-dev musl-dev openssl-dev libffi-dev && \ chmod +x /usr/local/bin/kubectl && \ @@ -28,17 +28,16 @@ RUN set -x && \ wget -O /check_for_ingress_and_nodeports.py https://git.onap.org/integration/plain/test/security/check_for_ingress_and_nodeports.py?h=$ONAP_TAG &&\ chmod +x /usr/local/bin/helm && \ chmod +x /usr/local/bin/helm3 && \ - rm -rf /usr/lib/python3.8/site-packages/PyYAML* && \ + rm -rf /usr/local/lib/python3.11/site-packages/PyYAML* && \ pip3 install --upgrade pip && \ - pip3 install --no-cache-dir -r requirements.txt -c upper-constraints.txt && \ - pip3 install --no-cache-dir -e . && \ - pip3 install --no-cache-dir \ - git+https://git.onap.org/integration.git@$ONAP_TESTS_TAG#subdirectory=test/security/check_certificates && \ pip3 install --ignore-installed --no-cache-dir \ - git+https://git.onap.org/testsuite/pythonsdk-tests.git@$ONAP_TESTS_TAG && \ + -r requirements.txt -c upper-constraints.txt \ + -e . \ + git+https://git.onap.org/testsuite/pythonsdk-tests.git@$ONAP_TESTS_TAG \ + git+https://git.onap.org/integration.git@$ONAP_TAG#subdirectory=test/security/check_certificates && \ apk del .build-deps -COPY docker/testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml -COPY docker/logging.ini /usr/lib/python3.8/site-packages/xtesting/ci/logging.ini -COPY docker/logging.debug.ini /usr/lib/python3.8/site-packages/xtesting/ci/logging.debug.ini +COPY docker/testcases.yaml /usr/local/lib/python3.11/site-packages/xtesting/ci/testcases.yaml +COPY docker/logging.ini /usr/local/lib/python3.11/site-packages/xtesting/ci/logging.ini +COPY docker/logging.debug.ini /usr/local/lib/python3.11/site-packages/xtesting/ci/logging.debug.ini CMD ["run_tests", "-t", "all"] diff --git a/smoke-usecases-pythonsdk/docker/Dockerfile b/smoke-usecases-pythonsdk/docker/Dockerfile index 08a0373..8de2a1f 100644 --- a/smoke-usecases-pythonsdk/docker/Dockerfile +++ b/smoke-usecases-pythonsdk/docker/Dockerfile @@ -1,6 +1,6 @@ ARG PYTHONSDK_VERSION=pythonsdk-release -FROM opnfv/xtesting:wallaby as pythonsdk-release +FROM python:3.11-alpine as pythonsdk-release MAINTAINER Morgan Richomme <morgan.richomme@orange.com> @@ -9,9 +9,8 @@ ARG ONAPSDK_PYTHON_PATH=/src/onapsdk ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1 -RUN apk add --no-cache python3 git && \ - apk add --no-cache --virtual .build-deps libffi-dev python3-dev \ - gcc openssl-dev linux-headers musl-dev && \ +RUN apk add --no-cache git && \ + apk add --no-cache --virtual .build-deps gcc openssl-dev linux-headers musl-dev && \ pip3 install --upgrade pip && \ pip3 install --ignore-installed --no-cache-dir \ git+https://gerrit.onap.org/r/testsuite/pythonsdk-tests@$ONAP_TESTS_TAG && \ @@ -24,5 +23,5 @@ FROM pythonsdk-release as pythonsdk-develop RUN pip3 install --no-cache-dir git+https://gitlab.com/Orange-OpenSource/lfn/onap/python-onapsdk@develop#onapsdk FROM ${PYTHONSDK_VERSION} as final -COPY docker/testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml +COPY docker/testcases.yaml /usr/local/lib/python3.11/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] |