X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Ftests%2FDockerfile;h=5ae1d3cbc2650f3828de4d8f75968c9e04a56875;hb=fd164afb3c0f828561b41c6c42a1e351c5d9b653;hp=b475d1ad34119ab6037362f827af0e7918e268b4;hpb=52dd2962119db74f9d259a76fdf8502345e9fe38;p=osm%2Fdevops.git

diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile
index b475d1ad..5ae1d3cb 100644
--- a/docker/tests/Dockerfile
+++ b/docker/tests/Dockerfile
@@ -13,35 +13,63 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ubuntu:18.04
+########################################################################
 
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install git software-properties-common \
-    curl xz-utils gnupg2 apt-transport-https make python3 debhelper python3-setuptools python3-pip apt-utils \
-    ssh iputils-ping libcurl4-openssl-dev libssl-dev python3-openstackclient
-RUN add-apt-repository -y ppa:rmescandon/yq && apt update && apt install yq -y
-RUN python3 -m pip install haikunator requests robotframework robotframework-seleniumlibrary \
-    robotframework-requests robotframework-jsonlibrary robotframework-sshlibrary charm-tools \
-    verboselogs pyangbind
+FROM ubuntu:18.04 as INSTALL
 
-ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
-ARG RELEASE=ReleaseEIGHT-daily
-ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
-ARG REPOSITORY=testing
-ARG TESTS_VERSION
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+    gcc=4:7.4.* \
+    python3=3.6.* \
+    python3-dev=3.6.* \
+    python3-setuptools=39.0.* \
+    curl=7.58.* \
+    gettext-base=0.19.* \
+    git=1:2.17.* \
+    iputils-ping=3:* \
+    jq=1.5* \
+    libcurl4-openssl-dev=7.58.* \
+    libssl-dev=1.1.* && \
+    python3 -m easy_install pip==21.0.1
 
-RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add -
-RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} tests osmclient IM" && apt-get update
+ARG OSM_TESTS_URL
+ARG PYTHON3_OSM_IM_URL
+ARG PYTHON3_OSMCLIENT_URL
 
-RUN apt-get install -y python3-osm-im${IM_VERSION} python3-osmclient${OSMCLIENT_VERSION}
-RUN apt-get install -y osm-tests${TESTS_VERSION} && \
-    rm -rf /var/lib/apt/lists/*
+# 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
+
+RUN curl $PYTHON3_OSMCLIENT_URL -o osmclient.deb
+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
 
-WORKDIR /robot-systest
+RUN git clone \
+    https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages.git \
+    --recurse-submodules \
+    /robot-systest/osm-packages
 
-RUN git clone https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages.git --recurse-submodules /robot-systest/osm-packages
+WORKDIR /robot-systest
 
 # Folder where Robot tests are stored
 ENV ROBOT_DEVOPS_FOLDER=/robot-systest
@@ -58,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