X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fansible-server%2Fpom.xml;h=41c814c461b186e903416341af242a58e0f13785;hb=9e330bbb4a08b62af1609fb74ea65a4ff4c8fa7c;hp=7e47321abb2ab469719df012261c012180af2b32;hpb=a5e125e54161ef3c1743222f01157a3a91a6aab9;p=sdnc%2Foam.git

diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml
index 7e47321a..41c814c4 100644
--- a/installation/ansible-server/pom.xml
+++ b/installation/ansible-server/pom.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.0.3</version>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-ansible-server</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.7.1-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates ansible-server Docker container</description>
@@ -19,6 +18,8 @@
     <properties>
         <image.name>onap/sdnc-ansible-server-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
+        <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
+        <ccsdk.docker.version>0.6.0</ccsdk.docker.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
@@ -36,22 +37,7 @@
                             <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <source>
-                                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'];
-                            </source>
+                            <source>${basedir}/../TagVersion.groovy</source>
                         </configuration>
                     </execution>
                 </executions>
@@ -62,7 +48,7 @@
                 <version>2.6</version>
                 <executions>
                     <execution>
-                        <id>copy-dockerfile</id>
+                        <id>copy-files</id>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals><!-- here the phase you need -->
@@ -71,49 +57,9 @@
                             <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>src/main/docker</directory>
-                                    <includes>
-                                        <include>Dockerfile</include>
-                                    </includes>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>copy-scripts</id>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
-                        <phase>validate</phase>
-                        <configuration>
-                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/scripts</directory>
-                                    <includes>
-                                        <include>*</include>
-                                    </includes>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>copy-yml</id>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
-                        <phase>validate</phase>
-                        <configuration>
-                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/Playbooks</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/yml</directory>
+                                    <directory>src/main</directory>
                                     <includes>
-                                        <include>*</include>
+                                        <include>**/*</include>
                                     </includes>
                                     <filtering>false</filtering>
                                 </resource>
@@ -122,54 +68,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <artifactId>exec-maven-plugin</artifactId>
-                <groupId>org.codehaus.mojo</groupId>
-                <version>1.5.0</version>
-                <executions>
-                    <execution>
-                        <id>change python permissions</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>/usr/bin/find</executable>
-                            <arguments>
-                                <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
-                                <argument>-name</argument>
-                                <argument>*.py</argument>
-                                <argument>-exec</argument>
-                                <argument>chmod</argument>
-                                <argument>+x</argument>
-                                <argument>{}</argument>
-                                <argument>;</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                    	<execution>
-						<id>change shell permissions</id>
-						<phase>process-sources</phase>
-						<goals>
-							<goal>exec</goal>
-						</goals>
-						<configuration>
-							<executable>/usr/bin/find</executable>
-							<arguments>
-								<argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
-								<argument>-name</argument>
-								<argument>*.sh</argument>
-								<argument>-exec</argument>
-								<argument>chmod</argument>
-								<argument>+x</argument>
-								<argument>{}</argument>
-								<argument>;</argument>
-							</arguments>
-						</configuration>
-					</execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
@@ -181,7 +79,7 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.16.5</version>
+                        <version>0.28.0</version>
                         <inherited>false</inherited>
                         <configuration>
                             <images>
@@ -190,11 +88,11 @@
                                     <build>
                                         <cleanup>try</cleanup>
                                         <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                        <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                        <dockerFile>Dockerfile</dockerFile>
                                         <tags>
-                                            <tag>${project.version}</tag>
-                                            <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
-                                            <tag>${project.docker.latesttag.version}</tag>
+                                            <tag>${project.docker.latestminortag.version}</tag>
+                                            <tag>${project.docker.latestfulltag.version}</tag>
+                                            <tag>${project.docker.latesttagtimestamp.version}</tag>
                                         </tags>
                                     </build>
                                 </image>