X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Ftests%2FDockerfile;h=39f1e3f124f0111ee299a73092a99b9013d8d42d;hb=refs%2Fchanges%2F04%2F12304%2F1;hp=a0cc7f805472172160b0a23aef3e8a7558a64f40;hpb=14e0ad76c67ac273317791b4b2b96aa04f5ea0ac;p=osm%2Fdevops.git

diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile
index a0cc7f80..39f1e3f1 100644
--- a/docker/tests/Dockerfile
+++ b/docker/tests/Dockerfile
@@ -15,22 +15,25 @@
 
 ########################################################################
 
-FROM ubuntu:18.04 as INSTALL
+FROM ubuntu:20.04 as FINAL
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    gcc=4:7.4.0-1ubuntu2.3 \
-    python3=3.6.7-1~18.04 \
-    python3-dev=3.6.7-1~18.04 \
-    python3-setuptools=39.0.1-2 \
-    curl=7.58.0-2ubuntu3.13 && \
-    python3 -m easy_install pip==21.0.1
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    git=1:2.17.1-1ubuntu0.8 \
-    jq=1.5+dfsg-2 \
-    libcurl4-openssl-dev=7.58.0-2ubuntu3.13 \
-    libssl-dev=1.1.1-1ubuntu2.1~18.04.9
+    gcc=4:9.3.* \
+    python3=3.8.* \
+    python3-dev=3.8.* \
+    python3-pip=20.0.2* \
+    python3-setuptools=45.2.* \
+    curl=7.68.*
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+    gettext-base=0.19.* \
+    git=1:2.25.* \
+    iputils-ping=3:* \
+    jq=1.6* \
+    libcurl4-openssl-dev=7.68.* \
+    libssl-dev=1.1.*
 
 ARG OSM_TESTS_URL
 ARG PYTHON3_OSM_IM_URL
@@ -51,8 +54,10 @@ RUN pip3 install \
     -r /usr/share/osm-tests/requirements.txt
 
 RUN mv /usr/share/osm-tests/robot-systest /robot-systest
+RUN mv /usr/share/osm-tests/conformance-tests/ /robot-systest/
 RUN mv /usr/share/osm-tests/charm.sh /usr/sbin/charm
 
+ARG CACHE_DATE=not_a_date
 RUN git clone \
     https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages.git \
     --recurse-submodules \
@@ -75,6 +80,9 @@ ENV ROBOT_REPORT_FOLDER=/robot-systest/results
 # Kubeconfig file
 ENV K8S_CREDENTIALS=/root/.kube/config
 
+# OSM RSA file
+ENV OSM_RSA_FILE=/root/osm_id_rsa
+
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8