X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Ftests%2FDockerfile;h=115f8fb8a93b35a09dd5f594562be2d8fa3a7b10;hb=refs%2Fchanges%2F75%2F11275%2F1;hp=689e37e5dca8e75717a626b9a65d874623ea4e7b;hpb=2ad643224e7f9b5443db6fdd41e1acb3535cec25;p=osm%2Fdevops.git

diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile
index 689e37e5..115f8fb8 100644
--- a/docker/tests/Dockerfile
+++ b/docker/tests/Dockerfile
@@ -30,23 +30,12 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     jq=1.5* \
     libcurl4-openssl-dev=7.58.* \
     libssl-dev=1.1.* && \
-    python3 -m easy_install pip==21.0.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,9 +76,6 @@ 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