Fix for Bug 1626: Build failed due to upstream dependency not found

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

diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile
index f191ddf..3bc0ce9 100644 (file)
--- a/docker/tests/Dockerfile
+++ b/docker/tests/Dockerfile
@@ -23,20 +23,30 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     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 \
+    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.13 \
-    libssl-dev=1.1.1-1ubuntu2.1~18.04.9
+    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
 
 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
 
@@ -76,6 +86,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