X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fansible-server%2Fpom.xml;h=8e38a4c8cd1a8223ee57a7b4af6279c5370a3a1e;hb=3f8719d1a0d283ea82cc2bb74ba2edc7beb186d8;hp=991aa91f2cbeec289a08018e815cea4ef5ed001b;hpb=95f86710cfec2e6267bc97280ab6cfad4cf44866;p=sdnc%2Foam.git
diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml
index 991aa91f..8e38a4c8 100644
--- a/installation/ansible-server/pom.xml
+++ b/installation/ansible-server/pom.xml
@@ -4,13 +4,13 @@
org.onap.ccsdk.parent
odlparent-lite
- 1.2.1-SNAPSHOT
+ 1.3.2
4.0.0
pom
org.onap.sdnc.oam
installation-ansible-server
- 1.5.0-SNAPSHOT
+ 1.6.2-SNAPSHOT
sdnc-oam :: installation :: ${project.artifactId}
Creates ansible-server Docker container
@@ -18,6 +18,7 @@
onap/sdnc-ansible-server-image
${project.version}
+ ${maven.build.timestamp}
0.4-STAGING-latest
${https_proxy}
yyyyMMdd'T'HHmmss'Z'
@@ -36,22 +37,7 @@
execute
-
- println project.properties['sdnc.project.version'];
- def versionArray;
- if ( project.properties['sdnc.project.version'] != null ) {
- versionArray = project.properties['sdnc.project.version'].split('\\.');
- }
-
- if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT"))
- {
- project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
- } else {
- project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
- }
-
- println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
-
+ ${basedir}/../TagVersion.groovy
@@ -62,7 +48,7 @@
2.6
- copy-dockerfile
+ copy-files
copy-resources
@@ -71,29 +57,9 @@
${basedir}/target/docker-stage
- src/main/docker
-
- Dockerfile
-
- true
-
-
-
-
-
-
- copy-yml
-
- copy-resources
-
- validate
-
- ${basedir}/target/docker-stage/opt/onap/ccsdk/Playbooks
-
-
- src/main/yml
+ src/main
- *
+ **/*
false
@@ -124,9 +90,9 @@
${basedir}/target/docker-stage
${basedir}/target/docker-stage/Dockerfile
- ${project.version}
- ${project.version}-STAGING-${maven.build.timestamp}
- ${project.docker.latesttag.version}
+ ${project.docker.latestminortag.version}
+ ${project.docker.latestfulltag.version}
+ ${project.docker.latesttagtimestamp.version}