Fixes Bug 1436- docker/tests/Dockerfile cryptography dependencies

Change-Id: I5169337e0a2859b117554955bed866174cef04ac
Signed-off-by: João Fonseca <jpedrofonseca@av.it.pt>

diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile
index 299fbbe..1d6d6da 100644 (file)
--- a/docker/RO/Dockerfile
+++ b/docker/RO/Dockerfile
@@ -21,7 +21,7 @@ FROM ubuntu:18.04
 MAINTAINER Gennadiy Dubina <gennadiy.dubina@dataat.com>; Alfonso Tierno <alfonso.tiernosepulveda@telefoncia.com>
 
 RUN apt-get update && apt-get -y install curl software-properties-common git tox python3-pip \
-    && python3 -m pip install --upgrade pip && python3 -m pip install pyangbind networking-l2gw
+    && python3 -m pip install --upgrade pip && python3 -m pip install pyangbind networking-l2gw uuid
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
 ARG RELEASE=ReleaseEIGHT-daily

diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile
index 4a8294c..901179f 100644 (file)
--- a/docker/tests/Dockerfile
+++ b/docker/tests/Dockerfile
@@ -16,12 +16,21 @@
 FROM ubuntu:18.04
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install git software-properties-common \
-    curl xz-utils gnupg2 apt-transport-https make python3 debhelper python3-setuptools python3-pip apt-utils \
-    ssh iputils-ping libcurl4-openssl-dev libssl-dev python3-openstackclient
-RUN add-apt-repository -y ppa:rmescandon/yq && apt update && apt install yq -y
-RUN python3 -m pip install haikunator requests robotframework robotframework-seleniumlibrary \
+    curl xz-utils gnupg2 apt-transport-https make python3 debhelper python3-pip apt-utils \
+    ssh iputils-ping libcurl4-openssl-dev libssl-dev
+RUN add-apt-repository -y ppa:rmescandon/yq && apt-get update && apt-get install yq -y
+
+RUN python3 -m pip install --upgrade pip setuptools
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cargo rustc
+
+RUN python3 -m pip install --ignore-installed pyyaml
+
+RUN python3 -m pip install --upgrade setuptools-rust 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
+    python-openstackclient
+
+RUN python3 -m pip install git+https://osm.etsi.org/gerrit/osm/IM.git@v8.0 git+https://osm.etsi.org/gerrit/osm/osmclient.git@v8.0
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
 ARG RELEASE=ReleaseEIGHT-daily

diff --git a/installers/docker/osm_pla/pla.yaml b/installers/docker/osm_pla/pla.yaml
index c5bdd50..39f1b9d 100644 (file)
--- a/installers/docker/osm_pla/pla.yaml
+++ b/installers/docker/osm_pla/pla.yaml
@@ -35,7 +35,7 @@ spec:
          command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongo 27017 ); do sleep 3; done; exit 0"]
       containers:
       - name: pla
-        image: opensourcemano/pla:7
+        image: opensourcemano/pla:8
         env:
         - name: OSMPLA_DATABASE_HOST
           value: mongo