Fixes for bug 1496
No longer uses a build layer as there are development tools we still
need at runtime.
Bug 1496
Change-Id: Ia655b88dd0e36cbba20b240be0aede5670904027
Signed-off-by: beierlm <mark.beierl@canonical.com>
diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile
index f4699ad..a0cc7f8 100644
--- a/docker/tests/Dockerfile
+++ b/docker/tests/Dockerfile
@@ -28,6 +28,7 @@
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
git=1:2.17.1-1ubuntu0.8 \
+ jq=1.5+dfsg-2 \
libcurl4-openssl-dev=7.58.0-2ubuntu3.13 \
libssl-dev=1.1.1-1ubuntu2.1~18.04.9
@@ -49,29 +50,14 @@
-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
+
RUN git clone \
https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages.git \
--recurse-submodules \
/robot-systest/osm-packages
-FROM ubuntu:18.04
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
- DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.7-1~18.04
-
-COPY --from=INSTALL /usr/bin/ssh-keygen /usr/bin/ssh-keygen
-COPY --from=INSTALL /usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/
-COPY --from=INSTALL /lib/x86_64-linux-gnu/ /lib/x86_64-linux-gnu/
-
-COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
-COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages /usr/local/lib/python3.6/dist-packages
-COPY --from=INSTALL /usr/bin/osm /usr/bin/osm
-
-COPY --from=INSTALL /usr/share/osm-tests/robot-systest /robot-systest
-COPY --from=INSTALL /usr/share/osm-tests/charm.sh /usr/sbin/charm
-COPY --from=INSTALL /robot-systest/osm-packages /robot-systest/osm-packages
-COPY --from=INSTALL /usr/local/bin/robot /usr/local/bin/
-
WORKDIR /robot-systest
# Folder where Robot tests are stored