aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asdctool/pom.xml3
-rw-r--r--catalog-be-plugins/backend-all-plugins/pom.xml5
-rw-r--r--catalog-be/pom.xml8
-rw-r--r--catalog-fe/pom.xml11
-rw-r--r--cucumber-js-test-apis-ci/pom.xml3
-rw-r--r--integration-tests/pom.xml3
-rw-r--r--openecomp-be/dist/sdc-onboard-backend-docker/pom.xml7
-rw-r--r--openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml7
-rw-r--r--pom.xml6
-rw-r--r--sdc-os-chef/pom.xml7
-rw-r--r--utils/webseal-simulator/pom.xml5
11 files changed, 31 insertions, 34 deletions
diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 0fcb5e0aa0..e733e08430 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -732,10 +732,11 @@
<cleanup>try</cleanup>
<dockerFileDir>${project.basedir}/sdc-cassandra-init</dockerFileDir>
<tags>
- <tag>${docker.tag}</tag>
+ <tag>latest</tag>
<tag>
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
</tag>
+ <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
</tags>
</build>
</image>
diff --git a/catalog-be-plugins/backend-all-plugins/pom.xml b/catalog-be-plugins/backend-all-plugins/pom.xml
index fa3ca01c6d..9714cf7c38 100644
--- a/catalog-be-plugins/backend-all-plugins/pom.xml
+++ b/catalog-be-plugins/backend-all-plugins/pom.xml
@@ -34,8 +34,6 @@ limitations under the License.
<artifactId>backend-all-plugins</artifactId>
<properties>
- <docker.tag>${project.version}-STAGING-${maven.build.timestamp}</docker.tag>
- <docker.latest.tag>${project.version}-STAGING-latest</docker.latest.tag>
<docker.skip.build>true</docker.skip.build>
<docker.skip.push>true</docker.skip.push>
<docker.skip.tag>true</docker.skip.tag>
@@ -78,10 +76,11 @@ limitations under the License.
<cleanup>try</cleanup>
<dockerFile>backend-all-plugins/Dockerfile</dockerFile>
<tags>
- <tag>${docker.tag}</tag>
+ <tag>latest</tag>
<tag>
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
</tag>
+ <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
</tags>
<assembly>
<descriptor>backend-all-plugins/backend-all-plugins-files.xml</descriptor>
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index dfe5706cc8..0ee54cbd48 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -18,8 +18,6 @@
<swagger-ui.version>3.25.0</swagger-ui.version>
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
<replacer.plugin.version>1.5.3</replacer.plugin.version>
- <docker.tag>${project.version}-STAGING-${maven.build.timestamp}</docker.tag>
- <docker.latest.tag>${project.version}-STAGING-latest</docker.latest.tag>
</properties>
<dependencies>
@@ -1062,10 +1060,11 @@
<cleanup>try</cleanup>
<dockerFileDir>backend</dockerFileDir>
<tags>
- <tag>${docker.tag}</tag>
+ <tag>latest</tag>
<tag>
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
</tag>
+ <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
</tags>
<assembly>
<descriptor>backend/backend-files.xml</descriptor>
@@ -1081,10 +1080,11 @@
<cleanup>try</cleanup>
<dockerFileDir>${project.basedir}/sdc-backend-init</dockerFileDir>
<tags>
- <tag>${docker.tag}</tag>
+ <tag>latest</tag>
<tag>
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
</tag>
+ <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
</tags>
</build>
</image>
diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index 057df35322..31d07a9caa 100644
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -472,14 +472,6 @@
</build>
</profile>
<profile>
- <id>docker-staging</id>
- <properties>
- <docker.tag>${project.version}-STAGING-${maven.build.timestamp}</docker.tag>
- <docker.latest.tag>${project.version}-STAGING-latest</docker.latest.tag>
- </properties>
- </profile>
-
- <profile>
<id>docker</id>
<activation>
<activeByDefault>false</activeByDefault>
@@ -542,10 +534,11 @@
<cleanup>try</cleanup>
<dockerFileDir>${project.basedir}/sdc-frontend</dockerFileDir>
<tags>
- <tag>${docker.tag}</tag>
+ <tag>latest</tag>
<tag>
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
</tag>
+ <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
</tags>
</build>
</image>
diff --git a/cucumber-js-test-apis-ci/pom.xml b/cucumber-js-test-apis-ci/pom.xml
index d588dacaa7..68165528cf 100644
--- a/cucumber-js-test-apis-ci/pom.xml
+++ b/cucumber-js-test-apis-ci/pom.xml
@@ -242,10 +242,11 @@
<cleanup>try</cleanup>
<dockerFileDir>${project.build.directory}/docker_assembly</dockerFileDir>
<tags>
- <tag>${docker.tag}</tag>
+ <tag>latest</tag>
<tag>
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
</tag>
+ <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
</tags>
</build>
</image>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 26c82250eb..88491ddd69 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -49,8 +49,7 @@ limitations under the License.
<it.chef.config>${project.build.directory}/chef-config</it.chef.config>
<it.sdc-be.plugins>${project.build.directory}/plugins/sdc-be</it.sdc-be.plugins>
<it.shared.volume>/tmp/sdc-integration-tests</it.shared.volume>
- <it.docker.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
- </it.docker.version>
+ <it.docker.version>latest</it.docker.version>
<it.ui.firefox.version>2.53.1</it.ui.firefox.version>
</properties>
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml
index d452bbe9a2..c07cc8a878 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml
@@ -126,8 +126,11 @@
<cleanup>try</cleanup>
<dockerFileDir>${project.basedir}/artifacts</dockerFileDir>
<tags>
- <tag>${docker.tag}</tag>
- <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
+ <tag>latest</tag>
+ <tag>
+ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+ </tag>
+ <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
</tags>
</build>
</image>
diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml b/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml
index 1276469562..d9abf66927 100644
--- a/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml
+++ b/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml
@@ -77,8 +77,11 @@
<cleanup>try</cleanup>
<dockerFileDir>${project.basedir}/artifacts</dockerFileDir>
<tags>
- <tag>${docker.tag}</tag>
- <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
+ <tag>latest</tag>
+ <tag>
+ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+ </tag>
+ <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
</tags>
</build>
</image>
diff --git a/pom.xml b/pom.xml
index 32fc63d5ff..b21ab20b60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,9 +39,9 @@ Modifications copyright (c) 2018-2019 Nokia
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<tosca.datatype.version>${project.version}</tosca.datatype.version>
-
<!-- 3rd parties versions -->
<bean-matcher.version>0.11</bean-matcher.version>
<lang3.version>3.10</lang3.version>
@@ -152,10 +152,6 @@ Modifications copyright (c) 2018-2019 Nokia
<nexus.proxy>https://nexus.onap.org</nexus.proxy>
<sitePath>/content/sites/site/org/openecomp/sdc/${project.version}</sitePath>
<staging.profile.id>176c31dfe190a</staging.profile.id>
- <!--maven-->
- <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
- <!--docker tags-->
- <docker.tag>${project.version}-${maven.build.timestamp}</docker.tag>
<!--togglz version-->
<togglz.version>2.6.1.Final</togglz.version>
diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index 4be865d2a0..29a594b773 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -77,8 +77,11 @@
<cleanup>try</cleanup>
<dockerFileDir>${project.basedir}/sdc-cassandra</dockerFileDir>
<tags>
- <tag>${docker.tag}</tag>
- <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
+ <tag>latest</tag>
+ <tag>
+ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+ </tag>
+ <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
</tags>
</build>
</image>
diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml
index 4b4e86bc67..2d027b74b0 100644
--- a/utils/webseal-simulator/pom.xml
+++ b/utils/webseal-simulator/pom.xml
@@ -18,8 +18,6 @@
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<nexus.proxy>https://nexus.onap.org</nexus.proxy>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <docker.tag>${project.version}-${maven.build.timestamp}</docker.tag>
- <docker.latest.tag>${project.version}-latest</docker.latest.tag>
<sonar.skip>true</sonar.skip>
</properties>
@@ -224,10 +222,11 @@
<cleanup>try</cleanup>
<dockerFileDir>${basedir}${file.separator}sdc-simulator</dockerFileDir>
<tags>
- <tag>${docker.tag}</tag>
+ <tag>latest</tag>
<tag>
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
</tag>
+ <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
</tags>
</build>
</image>