diff options
author | Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> | 2021-01-15 17:20:00 +0200 |
---|---|---|
committer | Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> | 2021-01-21 13:16:48 +0200 |
commit | 133593ad30f5eaa8bddca89c191e334b5d7e8bbd (patch) | |
tree | 7516fca99360c957015486545346ee2742ab0b66 /odlsli | |
parent | 9a44c20511157eb6bb35254712020c82cf786211 (diff) |
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
Diffstat (limited to 'odlsli')
-rw-r--r-- | odlsli/odlsli-alpine/pom.xml | 8 |
1 files changed, 2 insertions, 6 deletions
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>> + </network> <ports> <port>odlsli.port:8181</port> </ports> |