From 5de622a8247c4cf4fc2bd4e5f8a947e60a8c4bfb Mon Sep 17 00:00:00 2001 From: mrichomme Date: Mon, 20 Apr 2020 14:50:27 +0200 Subject: Resync integration/xtesting repo Issue-ID: INT-1366 Signed-off-by: mrichomme Change-Id: I3af9c4697f0e67d3ce5b6d2fceeb978aeb20a0ff --- smoke-usecases-robot/docker/Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'smoke-usecases-robot/docker') diff --git a/smoke-usecases-robot/docker/Dockerfile b/smoke-usecases-robot/docker/Dockerfile index 38616aa..8dbe29a 100644 --- a/smoke-usecases-robot/docker/Dockerfile +++ b/smoke-usecases-robot/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/xtesting +FROM opnfv/xtesting:jerma MAINTAINER Morgan Richomme @@ -10,7 +10,8 @@ ARG PIP_TAG=19.3.1 ENV TAG all COPY requirements.txt requirements.txt -RUN apk --no-cache add --virtual .build-deps --update \ +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 \ openssl-dev libjpeg-turbo-dev && \ pip3 install --upgrade pip && \ @@ -26,14 +27,15 @@ RUN apk --no-cache add --virtual .build-deps --update \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \ -rrequirements.txt && \ mkdir -p /var/opt/ONAP/demo/heat && cp -Rf /src/demo/heat/vFW /var/opt/ONAP/demo/heat/ && \ + mkdir -p /var/opt/ONAP/demo/tosca && cp -Rf /src/demo/tosca/pNF /var/opt/ONAP/demo/tosca/ && \ 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.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 && \ + 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 && \ 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.8/site-packages/xtesting/ci/testcases.yaml +COPY docker/testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml COPY scripts/cmd.sh / CMD ["/cmd.sh"] -- cgit 1.2.3-korg