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
---
 odlsli/odlsli-alpine/pom.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'odlsli/odlsli-alpine')

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