Added CACHE_DATE arg to force recreating the docker layer during docker build of...

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

diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile
index 4a8294c..18ebe8e 100644 (file)
--- a/docker/tests/Dockerfile
+++ b/docker/tests/Dockerfile
@@ -17,21 +17,37 @@ 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
+    ssh iputils-ping libcurl4-openssl-dev libssl-dev python3-yaml \
+    build-essential libssl-dev libffi-dev python3-dev
 RUN add-apt-repository -y ppa:rmescandon/yq && apt update && apt install yq -y
-RUN python3 -m pip install haikunator requests robotframework robotframework-seleniumlibrary \
+
+RUN python3 -m pip install --upgrade pip
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cargo rustc
+
+RUN python3 --version && python3 -m pip --version
+RUN rustc --version && cargo --version
+
+RUN python3 -m pip install --upgrade setuptools setuptools-rust
+
+RUN python3 -m pip install --ignore-installed pyyaml
+
+RUN python3 -m pip install --upgrade haikunator requests robotframework robotframework-seleniumlibrary \
     robotframework-requests robotframework-jsonlibrary robotframework-sshlibrary charm-tools \
-    git+https://osm.etsi.org/gerrit/osm/IM.git git+https://osm.etsi.org/gerrit/osm/osmclient.git
+    verboselogs pyangbind python-openstackclient
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
-ARG RELEASE=ReleaseEIGHT-daily
+ARG RELEASE=ReleaseNINE-daily
 ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
 ARG REPOSITORY=testing
 ARG TESTS_VERSION
+ARG IM_VERSION
+ARG OSMCLIENT_VERSION
 
 RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add -
-RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} tests" && apt-get update
+RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} tests osmclient IM" && apt-get update
 
+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/*
 
@@ -40,6 +56,7 @@ RUN mv /usr/share/osm-tests/charm.sh /usr/sbin/charm
 
 WORKDIR /robot-systest
 
+ARG CACHE_DATE=2021-03-01
 RUN git clone https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages.git --recurse-submodules /robot-systest/osm-packages
 
 # Folder where Robot tests are stored