X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Ftests%2FDockerfile;h=711b66a7e4b47b51b13ae7e2e3781ae3742838f0;hb=c17b5f290c39de22061103846c86ccf2bea7749b;hp=da5157259e56f562add496743432a7d2d0087406;hpb=fae01a9caf3b3a4234e25ebc3f4f6182ac487adb;p=osm%2Fdevops.git diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile index da515725..711b66a7 100644 --- a/docker/tests/Dockerfile +++ b/docker/tests/Dockerfile @@ -36,17 +36,6 @@ 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 @@ -86,8 +75,8 @@ 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 ENV LC_ALL=C.UTF-8 ENV LANG=C.UTF-8