X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlsli%2Fodlsli-alpine%2Fpom.xml;h=41ef7b734d4216f8be72b998403ca338f088b210;hb=643e032e9078ab47e1abb1f088aaec58a3361c7c;hp=7742d6b64a96d611bf95a91bb381b84e73151736;hpb=b6e7d96acfa2459c7a8c8f9fbdefcfacaf62e9f2;p=ccsdk%2Fdistribution.git

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 7742d6b6..41ef7b73 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -3,15 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.distribution</groupId>
+        <artifactId>distribution-odlsli</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>distribution-odlsli-alpine</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: odlsli-alpine</name>
@@ -21,7 +20,7 @@
     </organization>
 
     <properties>
-        <base.image.name>onap/ccsdk-odl-sodium-alpine-image</base.image.name>
+        <base.image.name>onap/ccsdk-odl-aluminum-alpine-image</base.image.name>
         <image.name>onap/ccsdk-odlsli-alpine-image</image.name>
 
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
@@ -30,23 +29,21 @@
 
         <docker.verbose>true</docker.verbose>
 
-        <uniquedockertag>${env.UNIQUE_DOCKER_TAG}</uniquedockertag>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <opendaylight.root>opt/opendaylight</opendaylight.root>
 
         <ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
-        <odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs, odl-daexim-all, odl-restconf-nb-rfc8040</odl.features.extra>
+        <odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040</odl.features.extra>
         <ccsdk.odl.features>
             ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all
         </ccsdk.odl.features>
         <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
-
-        <ccsdk.features.version>1.1.0</ccsdk.features.version>
-        <ccsdk.sli.core.version>1.1.0</ccsdk.sli.core.version>
-        <ccsdk.sli.adaptors.version>1.1.0</ccsdk.sli.adaptors.version>
-        <ccsdk.sli.northbound.version>1.1.0</ccsdk.sli.northbound.version>
-        <ccsdk.sli.plugins.version>1.1.0</ccsdk.sli.plugins.version>
-        <ccsdk.oran.a1adapter.version>1.1.0</ccsdk.oran.a1adapter.version>
+    	<ccsdk.features.version>1.1.1</ccsdk.features.version>
+    	<ccsdk.sli.core.version>1.2.0</ccsdk.sli.core.version>
+        <ccsdk.sli.adaptors.version>1.2.0</ccsdk.sli.adaptors.version>
+        <ccsdk.sli.northbound.version>1.2.0</ccsdk.sli.northbound.version>
+	    <ccsdk.sli.plugins.version>1.2.0</ccsdk.sli.plugins.version>
+        <ccsdk.oran.a1adapter.version>1.1.1</ccsdk.oran.a1adapter.version>
         <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
     </properties>
 
@@ -511,6 +508,26 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <id>change shell permissions</id>
+                        <phase>process-sources</phase>
+                        <configuration>
+                            <target>
+                                <chmod dir="${basedir}/target/docker-stage/opt/onap/ccsdk" perm="+x" includes="**/*.sh"/>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!--
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
@@ -538,6 +555,7 @@
                     </execution>
                 </executions>
             </plugin>
+            -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
@@ -597,21 +615,20 @@
                                     <name>${image.name}</name>
                                     <build>
                                         <cleanup>try</cleanup>
+                                        <noCache>true</noCache>
                                         <contextDir>${basedir}/target/docker-stage</contextDir>
                                         <dockerFile>Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${project.docker.latestminortag.snapshot.version}</tag>
                                             <tag>${project.docker.latestfulltag.snapshot.version}</tag>
                                             <tag>${project.docker.latesttagtimestamp.snapshot.version}</tag>
-                                            <tag>${project.docker.uniquedockertag.snapshot.version}</tag>
                                         </tags>
                                     </build>
                                 </image>
                             </images>
                             <verbose>${docker.verbose}</verbose>
-                            <!-- Hardocding skipPush to false, as during verification CSIT currently pulling docker image from nexus -->
-                            <!-- <skipPush>${docker.skip.push}</skipPush> -->
-                            <skipPush>false</skipPush>
+                            <skipRun>${docker.skip.run}</skipRun>
+                            <skipPush>${docker.skip.push}</skipPush>
                         </configuration>
                         <executions>
                             <execution>
@@ -635,9 +652,12 @@
                                             <run>
                                                 <env>
                                                     <MYSQL_ROOT_PASSWORD>itsASecret</MYSQL_ROOT_PASSWORD>
+                                                    <!-- Below are not required as installSdncDb.sh handles same -->
+                                                    <!--
                                                     <MYSQL_USER>sdnctl</MYSQL_USER>
                                                     <MYSQL_PASSWORD>gamma</MYSQL_PASSWORD>
                                                     <MYSQL_DATABASE>sdnctl</MYSQL_DATABASE>
+                                                    -->
                                                 </env>
                                                 <network>
                                                     <mode>custom</mode>
@@ -660,9 +680,9 @@
                                             <run>
                                                 <env>
                                                     <MYSQL_ROOT_PASSWORD>itsASecret</MYSQL_ROOT_PASSWORD>
-                                                    <MYSQL_USER>sdnctl</MYSQL_USER>
-                                                    <MYSQL_PASSWORD>gamma</MYSQL_PASSWORD>
-                                                    <MYSQL_DATABASE>sdnctl</MYSQL_DATABASE>
+                                                    <SDNC_DB_USER>sdnctl</SDNC_DB_USER>
+                                                    <SDNC_DB_PASSWORD>gamma</SDNC_DB_PASSWORD>
+                                                    <SDNC_DB_DATABASE>sdnctl</SDNC_DB_DATABASE>
                                                     <SDNC_CONFIG_DIR>/opt/onap/ccsdk/data/properties</SDNC_CONFIG_DIR>
                                                     <KARAF_CONSOLE_LOG_LEVEL>INFO</KARAF_CONSOLE_LOG_LEVEL>
                                                 </env>
@@ -673,13 +693,13 @@
                                                     <mode>custom</mode>
                                                     <name>onap</name>
                                                     <alias>odlsli</alias>
-                                                </network>&gt;
+                                                </network>
                                                 <ports>
                                                     <port>odlsli.port:8181</port>
                                                 </ports>
                                                 <wait>
                                                     <log>all warp coils are now operating at peak efficiency</log>
-                                                    <time>120000</time>
+                                                    <time>150000</time>
                                                 </wait>
                                                 <log>
                                                     <enabled>true</enabled>