X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Ftests%2FDockerfile;h=a2c4378a1d4416282c01a3ad09814e972f80d60f;hb=refs%2Fchanges%2F42%2F10842%2F7;hp=33dc63b0deb1e5254f9d82f62a05a5cd397ecce7;hpb=b7608055809d664eed0ee804d74e1cb4903245e8;p=osm%2Fdevops.git

diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile
index 33dc63b0..a2c4378a 100644
--- a/docker/tests/Dockerfile
+++ b/docker/tests/Dockerfile
@@ -27,7 +27,10 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     python3 -m easy_install pip==21.0.1
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+    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.13 \
     libssl-dev=1.1.1-1ubuntu2.1~18.04.9
 
@@ -44,30 +47,19 @@ RUN dpkg -i ./osmclient.deb
 RUN curl $OSM_TESTS_URL -o osm_tests.deb
 RUN dpkg -i ./osm_tests.deb
 
-
 RUN pip3 install \
     -r /usr/lib/python3/dist-packages/osm_im/requirements.txt \
     -r /usr/lib/python3/dist-packages/osmclient/requirements.txt \
     -r /usr/share/osm-tests/requirements.txt
 
+RUN mv /usr/share/osm-tests/robot-systest /robot-systest
+RUN mv /usr/share/osm-tests/charm.sh /usr/sbin/charm
+
 RUN git clone \
     https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages.git \
     --recurse-submodules \
     /robot-systest/osm-packages
 
-FROM ubuntu:18.04
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
-    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.7-1~18.04
-
-COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
-COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages  /usr/local/lib/python3.6/dist-packages
-COPY --from=INSTALL /usr/bin/osm /usr/bin/osm
-
-COPY --from=INSTALL /usr/share/osm-tests/robot-systest /robot-systest
-COPY --from=INSTALL /usr/share/osm-tests/charm.sh /usr/sbin/charm
-COPY --from=INSTALL /robot-systest/osm-packages /robot-systest/osm-packages
-
 WORKDIR /robot-systest
 
 # Folder where Robot tests are stored