summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvasraz <vasyl.razinkov@est.tech>2019-12-05 13:53:51 +0000
committervasraz <vasyl.razinkov@est.tech>2019-12-05 14:58:25 +0000
commitbbe2a934c76de7c0153854981de9a76258ca5564 (patch)
tree6e65bf9114ed8afb5149ed02bab59770cda04a86
parent1cbcf8ee77b394cd0f4e896197e24f09acef5861 (diff)
Fix failed merge job
Change-Id: I0b4a77bacffc65976fdcc4eeb01cef6edbc9deee Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2687
-rw-r--r--cucumber-js-test-apis-ci/pom.xml8
-rw-r--r--test-apis-ci/pom.xml12
2 files changed, 7 insertions, 13 deletions
diff --git a/cucumber-js-test-apis-ci/pom.xml b/cucumber-js-test-apis-ci/pom.xml
index b434408c1a..fb6a62d96d 100644
--- a/cucumber-js-test-apis-ci/pom.xml
+++ b/cucumber-js-test-apis-ci/pom.xml
@@ -260,9 +260,7 @@
</goals>
<configuration>
<removeAll>true</removeAll>
- <images>
- <image>onap/cucumber-sdc-api-tests</image>
- </images>
+ <image>onap/cucumber-sdc-api-tests</image>
</configuration>
</execution>
<execution>
@@ -279,9 +277,7 @@
<goal>push</goal>
</goals>
<configuration>
- <images>
- <image>onap/cucumber-sdc-api-tests</image>
- </images>
+ <image>onap/cucumber-sdc-api-tests</image>
</configuration>
</execution>
</executions>
diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml
index fa79ff2be0..807b59d63b 100644
--- a/test-apis-ci/pom.xml
+++ b/test-apis-ci/pom.xml
@@ -600,7 +600,9 @@
<dockerFileDir>${project.basedir}/sdc-api-tests</dockerFileDir>
<tags>
<tag>${docker.tag}</tag>
- <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
+ <tag>
+ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+ </tag>
</tags>
</build>
</image>
@@ -615,9 +617,7 @@
</goals>
<configuration>
<removeAll>true</removeAll>
- <images>
- <image>onap/sdc-api-tests</image>
- </images>
+ <image>onap/sdc-api-tests</image>
</configuration>
</execution>
@@ -636,9 +636,7 @@
<goal>push</goal>
</goals>
<configuration>
- <images>
- <image>onap/sdc-api-tests</image>
- </images>
+ <image>onap/sdc-api-tests</image>
</configuration>
</execution>
</executions>