From 2f3a6c3bcf64cc26abf6e6f24fbeb02d20a8fe11 Mon Sep 17 00:00:00 2001 From: madavi Date: Mon, 2 Dec 2019 16:45:19 +0530 Subject: [PATCH] BUG 906 Stage3 job cannot find updated RO package version Change-Id: Iee150272546e6f5aa0896aa7e43d4e264db96719 Signed-off-by: madavi --- docker/LCM/Dockerfile | 2 +- docker/RO/Dockerfile | 4 ++-- docker/osmclient/Dockerfile | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index 34ab1272..8b2cee69 100644 --- a/docker/LCM/Dockerfile +++ b/docker/LCM/Dockerfile @@ -39,7 +39,7 @@ APT::AutoRemove::SuggestsImportant "false";\n'\ RUN apt-get update && apt-get -y install curl software-properties-common -RUN apt-get install -y git make python3 \ +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git make python3 \ python3-pip python3-pymongo python3-aiohttp \ python3-all python3-setuptools openssh-client libffi-dev libssl-dev \ python3-bitarray python3-regex python3-lxml dh-python wget tox \ diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile index bf69ccac..3020e353 100644 --- a/docker/RO/Dockerfile +++ b/docker/RO/Dockerfile @@ -16,7 +16,7 @@ ######################################################################## -from ubuntu:18.04 +FROM ubuntu:18.04 MAINTAINER Gennadiy Dubina ; Alfonso Tierno @@ -34,7 +34,7 @@ RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} RO IM ARG RO_VERSION ARG IM_VERSION -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python3-osm-ro${RO_VERSION} python3-osm-im${IM_VERSION} \ +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y python3-osm-ro${RO_VERSION} python3-osm-im${IM_VERSION} \ python3-osm-roclient${RO_VERSION} \ python3-osm-rosdn-tapi${RO_VERSION} python3-osm-rosdn-dynpac${RO_VERSION} python3-osm-rosdn-onosof${RO_VERSION} \ python3-osm-rovim-vmware${RO_VERSION} python3-osm-rovim-openstack${RO_VERSION} \ diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile index 95515ec2..1061ea0f 100644 --- a/docker/osmclient/Dockerfile +++ b/docker/osmclient/Dockerfile @@ -19,7 +19,7 @@ FROM ubuntu:16.04 -LABEL authors="Michael Marchetti" +LABEL authors="Michael Marchetti, Jayant Madavi " RUN apt-get update && apt-get -y install curl software-properties-common @@ -42,8 +42,8 @@ ARG OSMCLIENT_VERSION ARG DEVOPS_VERSION ARG IM_VERSION -RUN apt-get update && apt-get -y install osm-devops${DEVOPS_VERSION} python-osm-im${IM_VERSION} -RUN apt-get -y install python3-osm-im${IM_VERSION} python3-osmclient${OSMCLIENT_VERSION} +RUN apt-get update && apt-get -y install osm-devops${DEVOPS_VERSION} python-osm-im${IM_VERSION} \ + python3-osm-im${IM_VERSION} python3-osmclient${OSMCLIENT_VERSION} ENV OSM_SOL005=True ENV OSM_HOSTNAME=nbi:9999 ENV OSM_RO_HOSTNAME=ro:9090 -- 2.17.1