From 133593ad30f5eaa8bddca89c191e334b5d7e8bbd Mon Sep 17 00:00:00 2001
From: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Date: Fri, 15 Jan 2021 17:20:00 +0200
Subject: 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
---
 dgbuilder-docker/pom.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'dgbuilder-docker')

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 @@
 
     <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>
-- 
cgit 1.2.3-korg