Fix docker files for healthcheck and robot

Add rust installation and change openstack tag

Issue-ID: TEST-404
Signed-off-by: Michal Jagiello <michal.jagiello@t-mobile.pl>
Change-Id: I5f9d6f43f819879f769c169e14eb2e44cb32b7d3

diff --git a/healthcheck/docker/Dockerfile b/healthcheck/docker/Dockerfile
index 2e98248..eb3086c 100644 (file)
--- a/healthcheck/docker/Dockerfile
+++ b/healthcheck/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM opnfv/xtesting:jerma
 
-ARG OPENSTACK_TAG=yoga
+ARG OPENSTACK_TAG=stable/newton
 ARG PIP_TAG=20.1
 ARG OPNFV_TAG=stable/jerma
 ARG ONAP_TAG=master
@@ -14,7 +14,9 @@ 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 \
-        openssl-dev libjpeg-turbo-dev && \
+        openssl-dev libjpeg-turbo-dev curl && \
+    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
+    . "$HOME/.cargo/env" && \
     pip3 install --upgrade pip && \
     pip3 install --no-cache-dir \
         -cupper-constraints.txt \

diff --git a/smoke-usecases-robot/docker/Dockerfile b/smoke-usecases-robot/docker/Dockerfile
index 77f87a8..395e5a7 100644 (file)
--- a/smoke-usecases-robot/docker/Dockerfile
+++ b/smoke-usecases-robot/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM opnfv/xtesting:jerma
 
 MAINTAINER Morgan Richomme <morgan.richomme@orange.com>
 
-ARG OPENSTACK_TAG=yoga
+ARG OPENSTACK_TAG=stable/newton
 ARG OPNFV_TAG=stable/jerma
 ARG ONAP_TAG=master
 ARG PIP_TAG=20.1
@@ -24,7 +24,9 @@ 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 \
-        openssl-dev libjpeg-turbo-dev && \
+        openssl-dev libjpeg-turbo-dev curl && \
+    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
+    . "$HOME/.cargo/env" && \
     chmod +x /usr/local/bin/kubectl && \
     pip3 install --upgrade pip && \
     pip3 install --no-cache-dir \