From 4439db95482aadd2818944e9327229cb1a7aed70 Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Fri, 18 Jun 2021 12:03:09 -0400 Subject: Effort to reduce image layer and size Removing few ENV version variable and those should be read from pom properties (maven-resource-plugin filtering true) Combined Dockerfile and Standalone.Dockerfile Adding Docker build arg AAF which will decide whether to add aaa-app-config.xml in docker image or not for standalone Updated docker-maven-plugin to 0.34.0 to have noCache true Removing start-it-container execution as it's being tested by CSIT Replacing maven-exec-plugin with maven-antrun-plugin Updating latest base docker images versions Updating parent version to 2.1.7 Issue-ID: CCSDK-3226 Signed-off-by: Singal, Kapil (ks220y) Change-Id: I68f8f4780804a2014b73b5eeb9dba29d1896a602 Former-commit-id: 4e674166ebefa6c8d9d929cc279ef175191f137b --- csit/plans/sdnc/setup.sh | 6 +++--- csit/scripts/docker-compose.yml | 4 ++-- csit/sdnc-csit.env | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'csit') diff --git a/csit/plans/sdnc/setup.sh b/csit/plans/sdnc/setup.sh index 037bc2e2..9294405c 100644 --- a/csit/plans/sdnc/setup.sh +++ b/csit/plans/sdnc/setup.sh @@ -18,7 +18,8 @@ # Modifications copyright (c) 2021 AT&T Intellectual Property # -# +# Remove all dangling images +docker image prune -f ###################### Netconf Simulator Setup ###################### @@ -30,7 +31,7 @@ fi mkdir ${WORKSPACE}/archives/pnf-simulator git clone "https://gerrit.onap.org/r/integration/simulators/pnf-simulator" ${WORKSPACE}/archives/pnf-simulator -# Fix docker-compose to add nexus repo for onap dockers +# Fix docker-compose to add nexus repo for onap dockers mv ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/docker-compose.yml ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/docker-compose.yml.orig cat ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/docker-compose.yml.orig | sed -e "s/image: onap/image: nexus3.onap.org:10001\/onap/" > ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/docker-compose.yml @@ -74,7 +75,6 @@ export LOCAL_IP=$(ip -4 addr show docker0 | grep -Po 'inet \K[\d.]+') unset http_proxy https_proxy - # start SDNC containers with docker compose and configuration from docker-compose.yml docker-compose -f ${SCRIPTS}/docker-compose.yml up -d diff --git a/csit/scripts/docker-compose.yml b/csit/scripts/docker-compose.yml index 13ee963b..215b2b6d 100755 --- a/csit/scripts/docker-compose.yml +++ b/csit/scripts/docker-compose.yml @@ -23,7 +23,7 @@ services: sdnc: image: onap/sdnc-image:latest - container_name: sdnc + container_name: sdnc_controller volumes: - /etc/localtime:/etc/localtime:ro - $SDNC_CERT_PATH:/opt/opendaylight/current/certs @@ -49,7 +49,7 @@ services: - ODL_USER=${ODL_USER} - ODL_PASSWORD=${ODL_PASSWORD} - ODL_CERT_DIR=/opt/opendaylight/current/certs - - SDNC_DB_INIT=true + - SDNC_DB_INIT=true - HONEYCOMB_USER=${HONEYCOMB_USER} - HONEYCOMB_PASSWORD=${HONEYCOMB_PASSWORD} - TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD} diff --git a/csit/sdnc-csit.env b/csit/sdnc-csit.env index d944927f..7abf30aa 100755 --- a/csit/sdnc-csit.env +++ b/csit/sdnc-csit.env @@ -1,4 +1,4 @@ -export SDNC_CONTAINER_NAME=sdnc +export SDNC_CONTAINER_NAME=sdnc_controller export SDNC_CERT_PATH=${WORKSPACE}/archives/certs export NETCONF_PNP_SIM_CONTAINER_NAME=netconf-simulator export TEMP_DIR_PATH=${WORKSPACE}/tests/netconf_tls_post_deploy/tmp @@ -8,10 +8,10 @@ export GERRIT_BRANCH=${GERRIT_BRANCH:-master} export NEXUS_USERNAME=${NEXUS_USERNAME:-docker} export NEXUS_PASSWD=${NEXUS_PASSWD:-docker} export NEXUS_DOCKER_REPO=${NEXUS_DOCKER_REPO:-nexus3.onap.org:10001} -export MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-secretPassword} -export MYSQL_USER=${MYSQL_USER:-testdb} -export MYSQL_PASSWORD=${MYSQL_PASSWORD:-test123} -export MYSQL_DATABASE=${MYSQL_DATABASE:-testdb} +export MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-itsASecret} +export MYSQL_USER=${MYSQL_USER:-sdnctl} +export MYSQL_PASSWORD=${MYSQL_PASSWORD:-gamma} +export MYSQL_DATABASE=${MYSQL_DATABASE:-sdnctl} export ODL_USER=${ODL_USER:-admin} export ODL_PASSWORD=${ODL_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} export HONEYCOMB_USER=${HONEYCOMB_USER:-admin} -- cgit 1.2.3-korg