summaryrefslogtreecommitdiffstats
path: root/sdc-os-chef
diff options
context:
space:
mode:
authorml636r <ml636r@att.com>2017-02-22 15:50:20 +0200
committerml636r <ml636r@att.com>2017-02-22 15:50:20 +0200
commita90804db040ed39e7541b8778c283a25b18d31b8 (patch)
tree9d9f744877217c9222a6a0bae939f77c7d53813b /sdc-os-chef
parent8aacedccc6bba71fa07b5dae902ab0be85dce09a (diff)
Remove duplicated docker build step
Change-Id: Ife65df6998098b8e5ccac270543aabd16682888b Signed-off-by: ml636r <ml636r@att.com>
Diffstat (limited to 'sdc-os-chef')
-rw-r--r--sdc-os-chef/pom.xml37
1 files changed, 18 insertions, 19 deletions
diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index d665595bb5..3d761df5e6 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -1,5 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -162,15 +162,15 @@
</configuration>
<executions>
<execution>
- <id>clean-images</id>
- <phase>pre-clean</phase>
- <goals>
- <goal>remove</goal>
- </goals>
- <configuration>
- <removeAll>true</removeAll>
- <image>openecomp/sdc-backend:%l,openecomp/sdc-frontend:%l,openecomp/sdc-elasticsearch:%l,openecomp/sdc-kibana:%l</image>
- </configuration>
+ <id>clean-images</id>
+ <phase>pre-clean</phase>
+ <goals>
+ <goal>remove</goal>
+ </goals>
+ <configuration>
+ <removeAll>true</removeAll>
+ <image>openecomp/sdc-backend:%l,openecomp/sdc-frontend:%l,openecomp/sdc-elasticsearch:%l,openecomp/sdc-kibana:%l</image>
+ </configuration>
</execution>
<execution>
@@ -182,15 +182,14 @@
</execution>
<execution>
- <id>push-images</id>
- <phase>deploy</phase>
- <goals>
- <goal>build</goal>
- <goal>push</goal>
- </goals>
- <configuration>
- <image>openecomp/sdc-backend:%l,openecomp/sdc-frontend:%l,openecomp/sdc-elasticsearch:%l,openecomp/sdc-kibana:%l</image>
- </configuration>
+ <id>push-images</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>push</goal>
+ </goals>
+ <configuration>
+ <image>openecomp/sdc-backend:%l,openecomp/sdc-frontend:%l,openecomp/sdc-elasticsearch:%l,openecomp/sdc-kibana:%l</image>
+ </configuration>
</execution>
</executions>