X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=docker%2Ftests%2FDockerfile;h=371430a8744dcdf2451f1a50a3b32db880e0a562;hb=8686601c00337e33edb3f74d79d61c68d61d135f;hp=f191ddf2814b32b7a08553d36a58b7b6e278b4eb;hpb=023e83c1369b6b67c03063a3eab0fb68909552fa;p=osm%2Fdevops.git diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile index f191ddf2..371430a8 100644 --- a/docker/tests/Dockerfile +++ b/docker/tests/Dockerfile @@ -29,6 +29,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ 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 @@ -37,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 @@ -76,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