X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FDockerfile;h=0431642c3aa4bfd306fb74cbfc1cf3c194b10b41;hb=4751c62e51f57d4a9d75d5f988728fd2cce62db4;hp=2ae03c9de30edb3932e908fbe4053f88dba77179;hpb=4cc047e7b0d4d8620f7a83d7c45e5b57733ef279;p=osm%2Ftests.git

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2ae03c9..0431642 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -19,22 +19,28 @@ FROM ubuntu:18.04
 
 # Installing robot dependencies
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install git software-properties-common \
-    make python3 debhelper python3-setuptools python3-pip apt-utils ssh iputils-ping libcurl4-openssl-dev libssl-dev \
-    python3-openstackclient
+    make python3 debhelper python3-pip apt-utils ssh iputils-ping libcurl4-openssl-dev libssl-dev cargo rustc
 
 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 git+https://osm.etsi.org/gerrit/osm/IM.git git+https://osm.etsi.org/gerrit/osm/osmclient.git
+RUN python3 -m pip install -U pip
+
+RUN python3 -m pip install charm-tools haikunator python-openstackclient requests robotframework \
+    robotframework-seleniumlibrary robotframework-requests robotframework-jsonlibrary robotframework-sshlibrary \
+    setuptools setuptools-rust git+https://osm.etsi.org/gerrit/osm/IM.git \
+    git+https://osm.etsi.org/gerrit/osm/osmclient.git
 
 # Preparing working environment
 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 --branch sol006 https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages.git --recurse-submodules /robot-systest/osm-packages
 
 # Copy robot folder and charm.sh
 COPY robot-systest /robot-systest
 COPY charm.sh /usr/sbin/charm
 
+# Copy conformance tests data
+COPY conformance-tests /robot-systest/conformance-tests
+
 # Folder where Robot tests are stored
 ENV ROBOT_DEVOPS_FOLDER=/robot-systest
 
@@ -45,7 +51,7 @@ ENV ENVIRONMENTS_FOLDER=environments
 ENV PACKAGES_FOLDER=/robot-systest/osm-packages
 
 # Folder where test results should be exported
-ENV ROBOT_REPORT_FOLDER=/robot-systest/results
+ENV ROBOT_REPORT_FOLDER=/robot-systest/reports
 
 # Kubeconfig file
 ENV K8S_CREDENTIALS=/root/.kube/config