From 0deca819997406ad73edbb82039c301381dc8074 Mon Sep 17 00:00:00 2001 From: Michal Jagiello Date: Fri, 7 Oct 2022 11:52:55 +0000 Subject: [ROBOT] Use upper constraints Installing the newest version of importlib_metadata breaks robot tests execution Use the same upper constraints as in robot smoke tests for healtcheck and benchmark docker images Issue-ID: INT-2160 Signed-off-by: Michal Jagiello Change-Id: I997c7ff47d5439cf2a96e1c67aa3ac4917d57110 --- benchmarking/docker/Dockerfile | 2 ++ benchmarking/upper-constraints.txt | 1 + healthcheck/docker/Dockerfile | 2 ++ healthcheck/upper-constraints.txt | 1 + 4 files changed, 6 insertions(+) create mode 100644 benchmarking/upper-constraints.txt create mode 100644 healthcheck/upper-constraints.txt diff --git a/benchmarking/docker/Dockerfile b/benchmarking/docker/Dockerfile index 2e5f653..38108cd 100644 --- a/benchmarking/docker/Dockerfile +++ b/benchmarking/docker/Dockerfile @@ -8,6 +8,7 @@ ENV PYTHONPATH $PYTHONPATH:/src/testing-utils/robotframework-onap/eteutils ENV TAG all COPY requirements.txt requirements.txt +COPY upper-constraints.txt upper-constraints.txt RUN apk --no-cache add --virtual .build-deps --update \ python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev && \ @@ -19,6 +20,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ pip==$PIP_TAG && \ pip3 install \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \ + -cupper-constraints.txt \ -rrequirements.txt \ -e /src/testing-utils/robotframework-onap && \ mkdir -p /var/opt/ONAP/demo/heat && cp -Rf /src/demo/heat/vFW /var/opt/ONAP/demo/heat/ && \ diff --git a/benchmarking/upper-constraints.txt b/benchmarking/upper-constraints.txt new file mode 100644 index 0000000..f72abaa --- /dev/null +++ b/benchmarking/upper-constraints.txt @@ -0,0 +1 @@ +importlib_metadata==4.12.0 \ No newline at end of file diff --git a/healthcheck/docker/Dockerfile b/healthcheck/docker/Dockerfile index 3ca0f00..80d64ad 100644 --- a/healthcheck/docker/Dockerfile +++ b/healthcheck/docker/Dockerfile @@ -10,6 +10,7 @@ ENV TAG all ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1 COPY requirements.txt requirements.txt +COPY upper-constraints.txt upper-constraints.txt RUN apk --no-cache add --update openssl chromium chromium-chromedriver && \ apk --no-cache add --virtual .build-deps --update \ python3-dev build-base linux-headers libffi-dev \ @@ -25,6 +26,7 @@ RUN apk --no-cache add --update openssl chromium chromium-chromedriver && \ pip==$PIP_TAG && \ pip install \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \ + -cupper-constraints.txt \ -rrequirements.txt && \ 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/ && \ diff --git a/healthcheck/upper-constraints.txt b/healthcheck/upper-constraints.txt new file mode 100644 index 0000000..f72abaa --- /dev/null +++ b/healthcheck/upper-constraints.txt @@ -0,0 +1 @@ +importlib_metadata==4.12.0 \ No newline at end of file -- cgit 1.2.3-korg