Adding Juju in the pipeline for Robot tests

[osm/devops.git] / docker / tests / Dockerfile

diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile
index f4699ad..371430a 100644 (file)
--- 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
 
@@ -35,6 +38,17 @@ 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
 
@@ -49,29 +63,14 @@ RUN pip3 install \
     -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/bin/ssh-keygen /usr/bin/ssh-keygen
-COPY --from=INSTALL /usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/
-COPY --from=INSTALL /lib/x86_64-linux-gnu/ /lib/x86_64-linux-gnu/
-
-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
-COPY --from=INSTALL /usr/local/bin/robot /usr/local/bin/
-
 WORKDIR /robot-systest
 
 # Folder where Robot tests are stored
@@ -89,6 +88,9 @@ 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
+
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8