X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Ftests%2FDockerfile;h=115f8fb8a93b35a09dd5f594562be2d8fa3a7b10;hb=56e03e471ee38b4ff7b2f045899ede2a7890fdbe;hp=3bc0ce94a5e09fdac163e9c0cd756ebf71bcb118;hpb=b89f26b8b330e5af11dc47c06c4e65cbbcd0a52b;p=osm%2Fdevops.git

diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile
index 3bc0ce94..115f8fb8 100644
--- a/docker/tests/Dockerfile
+++ b/docker/tests/Dockerfile
@@ -19,34 +19,23 @@ FROM ubuntu:18.04 as INSTALL
 
 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.14 \
-    gettext-base \
-    git=1:2.17.1-1ubuntu0.8 \
-    iputils-ping=3:20161105-1ubuntu3 \
-    jq=1.5+dfsg-2 \
-    libcurl4-openssl-dev=7.58.0-2ubuntu3.14 \
-    libssl-dev=1.1.1-1ubuntu2.1~18.04.9 && \
-    python3 -m easy_install pip==21.0.1
+    gcc=4:7.4.* \
+    python3=3.6.* \
+    python3-dev=3.6.* \
+    python3-setuptools=39.0.* \
+    curl=7.58.* \
+    gettext-base=0.19.* \
+    git=1:2.17.* \
+    iputils-ping=3:* \
+    jq=1.5* \
+    libcurl4-openssl-dev=7.58.* \
+    libssl-dev=1.1.* && \
+    python3 -m easy_install pip==21.0.1 setuptools==51.0.0
 
 ARG OSM_TESTS_URL
 ARG PYTHON3_OSM_IM_URL
 ARG PYTHON3_OSMCLIENT_URL
 
-# Installing Juju
-ARG JUJU_VERSION_M=2.8
-ARG JUJU_VERSION_R=11
-ARG JUJU_VERSION=$JUJU_VERSION_M.$JUJU_VERSION_R
-
-RUN curl --output /tmp/juju-$JUJU_VERSION-linux-amd64.tar.xz -LO \
-    https://launchpad.net/juju/$JUJU_VERSION_M/$JUJU_VERSION/+download/juju-$JUJU_VERSION-linux-amd64.tar.xz && \
-    tar -xf /tmp/juju-$JUJU_VERSION-linux-amd64.tar.xz -C /tmp && \
-    install /tmp/juju /usr/local/bin/juju && \
-    rm /tmp/juju /tmp/juju-$JUJU_VERSION-linux-amd64.tar.xz
-
 RUN curl $PYTHON3_OSM_IM_URL -o osm_im.deb
 RUN dpkg -i ./osm_im.deb
 
@@ -62,6 +51,7 @@ 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
 
 RUN git clone \
@@ -86,8 +76,8 @@ ENV ROBOT_REPORT_FOLDER=/robot-systest/results
 # Kubeconfig file
 ENV K8S_CREDENTIALS=/root/.kube/config
 
-# Juju data folder
-ENV JUJU_DATA=/root/.local/share/juju
+# OSM RSA file
+ENV OSM_RSA_FILE=/root/osm_id_rsa
 
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8