Merge "Bug 873: Robot Automation improvement: NS_CONFIG Provided via both 1. Using Environment variable/file 2. Using Testsuit Variable"
diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index e7a86cb..5ee783f 100644
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -107,9 +107,13 @@
# VCA
ENV OSMLCM_VCA_HOST vca
-ENV OSMLCM_VCA_PORT: 17070
-ENV OSMLCM_VCA_USER: admin
-ENV OSMLCM_VCA_SECRET: secret
+ENV OSMLCM_VCA_PORT 17070
+ENV OSMLCM_VCA_USER admin
+ENV OSMLCM_VCA_SECRET secret
+# ENV OSMLCM_VCA_PUBKEY pubkey
+# ENV OSMLCM_VCA_CACERT cacert
+# ENV OSMLCM_VCA_ENABLEOSUPGRADE false
+# ENV OSMLCM_VCA_APTMIRROR http://archive.ubuntu.com/ubuntu/
# database
ENV OSMLCM_DATABASE_DRIVER mongo
diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile
index 1061ea0..a0b1e44 100644
--- a/docker/osmclient/Dockerfile
+++ b/docker/osmclient/Dockerfile
@@ -17,33 +17,31 @@
##
-FROM ubuntu:16.04
+FROM ubuntu:18.04
-LABEL authors="Michael Marchetti, Jayant Madavi <JM00553988@techmahindra.com>"
+MAINTAINER Gerardo Garcia <gerardo.garciadeblas@telefonica.com>; Jayant Madavi <JM00553988@techmahindra.com>
RUN apt-get update && apt-get -y install curl software-properties-common
-RUN apt-get update && apt-get -y install python \
- libcurl4-gnutls-dev libgnutls-dev iputils-ping python-pip \
- python-openstackclient wget python3-pip
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install wget python3 python3-pip \
+ libcurl4-gnutls-dev python3-openstackclient
-RUN pip install -U pip && python -m pip install python-magic pyangbind pytest==4.6.3
RUN python3 -m pip install -U pip && python3 -m pip install pyyaml python-magic pyangbind pytest==4.6.3
ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
-ARG RELEASE=ReleaseFOUR-daily
+ARG RELEASE=ReleaseSEVEN-daily
ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
ARG REPOSITORY=testing
RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add -
-RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} devops osmclient IM" && apt update
+RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} devops osmclient IM" && apt-get update
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 update && apt-get -y install osm-devops${DEVOPS_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
+
diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index c8b846d..104de48 100644
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -270,3 +270,9 @@
- "${OSM_GRAFANA_PORTS:-3000:3000}"
networks:
- netOSM
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "100m"
+ max-file: "2"
+
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index ead32dc..6e226cc 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -914,6 +914,14 @@
$WORKDIR_SUDO sed -i "s|OSMLCM_VCA_APIPROXY.*|OSMLCM_VCA_APIPROXY=${OSM_VCA_APIPROXY}|g" $OSM_DOCKER_WORK_DIR/lcm.env
fi
+ if ! grep -Fq "OSMLCM_VCA_ENABLEOSUPGRADE" $OSM_DOCKER_WORK_DIR/lcm.env; then
+ echo "# OSMLCM_VCA_ENABLEOSUPGRADE=false" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/lcm.env
+ fi
+
+ if ! grep -Fq "OSMLCM_VCA_APTMIRROR" $OSM_DOCKER_WORK_DIR/lcm.env; then
+ echo "# OSMLCM_VCA_APTMIRROR=http://archive.ubuntu.com/ubuntu/" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/lcm.env
+ fi
+
# RO
MYSQL_ROOT_PASSWORD=$(generate_secret)
if [ ! -f $OSM_DOCKER_WORK_DIR/ro-db.env ]; then
@@ -1295,7 +1303,7 @@
remove_k8s_namespace $OSM_STACK_NAME
deploy_cni_provider
kube_secrets
- [ ! $OSM_DOCKER_TAG == "latest" ] && parse_yaml $OSM_DOCKER_TAG
+ [ ! $OSM_DOCKER_TAG == "7" ] && parse_yaml $OSM_DOCKER_TAG
namespace_vol
deploy_osm_services
track deploy_osm_services_k8s