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 <l.kaihlavirt@partner.samsung.com>
Change-Id: Ibc391ef4fc9412665a26486af6fcc8c26096cc64

diff --git a/csit/.gitignore b/csit/.gitignore
index 2b9c92f..a4dcadc 100644 (file)
--- 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 a34c44a..327aba2 100644 (file)
--- 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 3dfbc0e..c06160a 100644 (file)
--- a/dgbuilder-docker/pom.xml
+++ b/dgbuilder-docker/pom.xml
@@ -20,7 +20,6 @@
 
     <properties>
         <image.name>onap/ccsdk-dgbuilder-image</image.name>
-        <uniquedockertag>${env.UNIQUE_DOCKER_TAG}</uniquedockertag>
     </properties>
 
     <build>
@@ -182,15 +181,12 @@
                                             <tag>${project.docker.latestminortag.snapshot.version}</tag>
                                             <tag>${project.docker.latestfulltag.snapshot.version}</tag>
                                             <tag>${project.docker.latesttagtimestamp.snapshot.version}</tag>
-                                                                                       <tag>${project.docker.uniquedockertag.snapshot.version}</tag>
                                         </tags>
                                     </build>
                                 </image>
                             </images>
                             <verbose>${docker.verbose}</verbose>
-                            <!-- Hardocding skipPush to false, as during verification CSIT currently pulling docker image from nexus -->
-                            <!-- <skipPush>${docker.skip.push}</skipPush> -->
-                            <skipPush>false</skipPush>
+                            <skipPush>${docker.skip.push}</skipPush>
                         </configuration>
                         <executions>
                             <execution>

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 7742d6b..df503fa 100644 (file)
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -30,7 +30,6 @@
 
         <docker.verbose>true</docker.verbose>
 
-        <uniquedockertag>${env.UNIQUE_DOCKER_TAG}</uniquedockertag>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <opendaylight.root>opt/opendaylight</opendaylight.root>
 
@@ -603,15 +602,12 @@
                                             <tag>${project.docker.latestminortag.snapshot.version}</tag>
                                             <tag>${project.docker.latestfulltag.snapshot.version}</tag>
                                             <tag>${project.docker.latesttagtimestamp.snapshot.version}</tag>
-                                            <tag>${project.docker.uniquedockertag.snapshot.version}</tag>
                                         </tags>
                                     </build>
                                 </image>
                             </images>
                             <verbose>${docker.verbose}</verbose>
-                            <!-- Hardocding skipPush to false, as during verification CSIT currently pulling docker image from nexus -->
-                            <!-- <skipPush>${docker.skip.push}</skipPush> -->
-                            <skipPush>false</skipPush>
+                            <skipPush>${docker.skip.push}</skipPush>
                         </configuration>
                         <executions>
                             <execution>
@@ -673,7 +669,7 @@
                                                     <mode>custom</mode>
                                                     <name>onap</name>
                                                     <alias>odlsli</alias>
-                                                </network>&gt;
+                                                </network>
                                                 <ports>
                                                     <port>odlsli.port:8181</port>
                                                 </ports>

diff --git a/src/main/scripts/TagSnapshotVersion.groovy b/src/main/scripts/TagSnapshotVersion.groovy
index 410b980..0c3a55b 100644 (file)
--- 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 9ed91c6..4a5e57f 100644 (file)
--- 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