Pip standardization 87/10587/2
authorbeierlm <mark.beierl@canonical.com>
Wed, 7 Apr 2021 11:34:04 +0000 (07:34 -0400)
committerbeierlm <mark.beierl@canonical.com>
Wed, 7 Apr 2021 12:29:53 +0000 (08:29 -0400)
Bring forward all shared libraries for tests container

Change-Id: I6388ede5461678fdefc9fe8fafa027db84747ed5
Signed-off-by: beierlm <mark.beierl@canonical.com>
docker/tests/Dockerfile

index 33dc63b..f4699ad 100644 (file)
@@ -44,7 +44,6 @@ 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 \
@@ -60,6 +59,10 @@ 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
@@ -67,6 +70,7 @@ 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