From 133593ad30f5eaa8bddca89c191e334b5d7e8bbd Mon Sep 17 00:00:00 2001 From: Lasse Kaihlavirta Date: Fri, 15 Jan 2021 17:20:00 +0200 Subject: [PATCH] Adjust CSIT for unified review verification - enable use of locally built images (without nexus repo prefix) in docker-compose.yaml - use local docker images in CSIT by default - remove forced docker image push of odlsli-alpine and dgbuilder - remove unique docker tag usage - this change requires https://gerrit.onap.org/r/c/ci-management/+/116920 to be merged to work correctly Issue-ID: INT-1823 Signed-off-by: Lasse Kaihlavirta Change-Id: Ibc391ef4fc9412665a26486af6fcc8c26096cc64 --- csit/.gitignore | 1 + csit/plans/healthcheck/setup.sh | 26 +++++++++++++------------- dgbuilder-docker/pom.xml | 6 +----- odlsli/odlsli-alpine/pom.xml | 8 ++------ src/main/scripts/TagSnapshotVersion.groovy | 1 - src/main/yaml/docker-compose.yml | 4 ++-- 6 files changed, 19 insertions(+), 27 deletions(-) diff --git a/csit/.gitignore b/csit/.gitignore index 2b9c92f1..a4dcadc2 100644 --- a/csit/.gitignore +++ b/csit/.gitignore @@ -3,3 +3,4 @@ prepare-csit.sh env.properties data/ archives/ +plans/healthcheck/docker-compose diff --git a/csit/plans/healthcheck/setup.sh b/csit/plans/healthcheck/setup.sh index a34c44ab..327aba21 100644 --- a/csit/plans/healthcheck/setup.sh +++ b/csit/plans/healthcheck/setup.sh @@ -15,21 +15,14 @@ # limitations under the License. # # Modifications copyright (c) 2017 AT&T Intellectual Property -# Modifications copyright (c) 2020 Samsung Electronics Co., Ltd. +# Modifications copyright (c) 2020-2021 Samsung Electronics Co., Ltd. # export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) -export NEXUS_DOCKER_REPO="nexus3.onap.org:10001" -export NEXUS_USERNAME=docker -export NEXUS_PASSWD=docker export DMAAP_TOPIC=AUTO -if [ "$UNIQUE_DOCKER_TAG" == "" ]; then - export CCSDK_DOCKER_IMAGE_VERSION=latest -else - source "${WORKSPACE}/../version.properties" - export CCSDK_DOCKER_IMAGE_VERSION=${snapshot_version}-${UNIQUE_DOCKER_TAG} -fi +# TODO: any reason to ever read the version from version.properties? +export CCSDK_DOCKER_IMAGE_VERSION=latest if [ "$MTU" == "" ]; then export MTU="1450" @@ -42,11 +35,18 @@ cd $WORKSPACE/archives/yaml unset http_proxy https_proxy sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="AUTO"/g" docker-compose.yml -docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-odlsli-alpine-image:$CCSDK_DOCKER_IMAGE_VERSION +# TODO: is there ever need to pull the images from Nexus? +# run-csit.sh already logins to nexus3.onap.org:10001 so this now works only if +# NEXUS_DOCKER_REPO is not defined at all (in which case the images must be available +# locally without any repository prefix) or if its value is nexus3.onap.org:10001 -docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION +if [ "$NEXUS_DOCKER_REPO" != "" ]; then + docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-odlsli-alpine-image:$CCSDK_DOCKER_IMAGE_VERSION + docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION + # Add trailing slash for docker-compose + export NEXUS_DOCKER_REPO=$NEXUS_DOCKER_REPO/ +fi # start CCSDK containers with docker compose and configuration from docker-compose.yml curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > docker-compose diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index 3dfbc0e7..c06160af 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -20,7 +20,6 @@ onap/ccsdk-dgbuilder-image - ${env.UNIQUE_DOCKER_TAG} @@ -182,15 +181,12 @@ ${project.docker.latestminortag.snapshot.version} ${project.docker.latestfulltag.snapshot.version} ${project.docker.latesttagtimestamp.snapshot.version} - ${project.docker.uniquedockertag.snapshot.version} ${docker.verbose} - - - false + ${docker.skip.push} diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 7742d6b6..df503fa9 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -30,7 +30,6 @@ true - ${env.UNIQUE_DOCKER_TAG} ${https_proxy} opt/opendaylight @@ -603,15 +602,12 @@ ${project.docker.latestminortag.snapshot.version} ${project.docker.latestfulltag.snapshot.version} ${project.docker.latesttagtimestamp.snapshot.version} - ${project.docker.uniquedockertag.snapshot.version} ${docker.verbose} - - - false + ${docker.skip.push} @@ -673,7 +669,7 @@ custom onap odlsli - > + odlsli.port:8181 diff --git a/src/main/scripts/TagSnapshotVersion.groovy b/src/main/scripts/TagSnapshotVersion.groovy index 410b980f..0c3a55b7 100644 --- a/src/main/scripts/TagSnapshotVersion.groovy +++ b/src/main/scripts/TagSnapshotVersion.groovy @@ -31,7 +31,6 @@ propertiesFile.withInputStream { project.properties['project.docker.latestminortag.snapshot.version']=properties.release_name + '.' + properties.sprint_number + "-SNAPSHOT-latest"; project.properties['project.docker.latestfulltag.snapshot.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-latest"; project.properties['project.docker.latesttagtimestamp.snapshot.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-"+project.properties['ccsdk.build.timestamp']; -project.properties['project.docker.uniquedockertag.snapshot.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-"+project.properties['uniquedockertag']; // Temporary solution for odl-sodium-alpine dependence in odlsli-alpine image build project.properties['project.docker.latestfulltag.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-STAGING-latest"; diff --git a/src/main/yaml/docker-compose.yml b/src/main/yaml/docker-compose.yml index 9ed91c69..4a5e57f9 100644 --- a/src/main/yaml/docker-compose.yml +++ b/src/main/yaml/docker-compose.yml @@ -17,7 +17,7 @@ services: odlsli: - image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-odlsli-alpine-image:${CCSDK_DOCKER_IMAGE_VERSION} + image: ${NEXUS_DOCKER_REPO}onap/ccsdk-odlsli-alpine-image:${CCSDK_DOCKER_IMAGE_VERSION} depends_on : - db container_name: ccsdk_odlsli_container @@ -38,7 +38,7 @@ services: max-file: "5" dgbuilder: - image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-dgbuilder-image:${CCSDK_DOCKER_IMAGE_VERSION} + image: ${NEXUS_DOCKER_REPO}onap/ccsdk-dgbuilder-image:${CCSDK_DOCKER_IMAGE_VERSION} depends_on: - db container_name: ccsdk_dgbuilder_container -- 2.16.6