From: beierlm <mark.beierl@canonical.com>
Date: Wed, 2 Dec 2020 11:43:07 +0000 (-0500)
Subject: Install from APT repo
X-Git-Tag: release-v9.0-start~25
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=52dd2962119db74f9d259a76fdf8502345e9fe38;hp=ae58dabd3561cb3628106b7baba06e58cf35262c;p=osm%2Fdevops.git

Install from APT repo

Changes the build so that it will install the osmclient from the
locally created apt repository instead of attempting to build it
again from the git sources.

Change-Id: Id096ae2343811b26e96ec1f9313d45ad69a9a68f
Signed-off-by: beierlm <mark.beierl@canonical.com>
---

diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile
index 4a8294c3..b475d1ad 100644
--- a/docker/tests/Dockerfile
+++ b/docker/tests/Dockerfile
@@ -21,7 +21,7 @@ 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=ReleaseEIGHT-daily
@@ -30,8 +30,9 @@ ARG REPOSITORY=testing
 ARG TESTS_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/*