From: vasraz <vasyl.razinkov@est.tech>
Date: Thu, 5 Dec 2019 13:53:51 +0000 (+0000)
Subject: Fix failed merge job
X-Git-Tag: 1.6.1~39
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F11%2F99211%2F2;p=sdc.git

Fix failed merge job

Change-Id: I0b4a77bacffc65976fdcc4eeb01cef6edbc9deee
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-2687
---

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>