Additional arguments

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

diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile
index a715318..a3b4e26 100644 (file)
--- a/docker/tests/Dockerfile
+++ b/docker/tests/Dockerfile
@@ -21,17 +21,20 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install git soft
 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
+    verboselogs pyangbind
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
-ARG RELEASE=ReleaseSEVEN-daily
+ARG RELEASE=ReleaseEIGHT-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/*
 
@@ -41,6 +44,7 @@ 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 -C osm-packages checkout sol006
 
 # Folder where Robot tests are stored
 ENV ROBOT_DEVOPS_FOLDER=/robot-systest
@@ -60,4 +64,4 @@ ENV K8S_CREDENTIALS=/root/.kube/config
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 
-ENTRYPOINT [ "/robot-systest/run_test.sh"]
\ No newline at end of file
+ENTRYPOINT [ "/robot-systest/run_test.sh"]