X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlsli%2Fodlsli-alpine%2Fpom.xml;h=847a4e6930751afc7edb2fbb0a06de9850132c53;hb=110bb110a48b98a40dad33e80071e0a21386f11d;hp=821e28ebcf907e79e3c2ae14077ac78234b85720;hpb=b160d082e5bf6a56c03cfed175f8d44c54528753;p=ccsdk%2Fdistribution.git

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 821e28eb..847a4e69 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>distribution-odlsli-alpine</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: odlsli-alpine</name>
@@ -24,7 +24,8 @@
         <base.image.name>onap/ccsdk-odl-sodium-alpine-image</base.image.name>
         <image.name>onap/ccsdk-odlsli-alpine-image</image.name>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
-        <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
+	<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
+	<uniquedockertag>${env.UNIQUE_DOCKER_TAG}</uniquedockertag>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
         <opendaylight.root>opt/opendaylight</opendaylight.root>
@@ -38,13 +39,14 @@
         </ccsdk.odl.features>
         <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
 
-        <ccsdk.features.version>1.0.0</ccsdk.features.version>
-        <ccsdk.sli.core.version>1.0.0</ccsdk.sli.core.version>
-        <ccsdk.sli.adaptors.version>1.0.0</ccsdk.sli.adaptors.version>
-        <ccsdk.sli.northbound.version>1.0.0</ccsdk.sli.northbound.version>
-        <ccsdk.sli.plugins.version>1.0.0</ccsdk.sli.plugins.version>
-        <ccsdk.oran.a1adapter.version>1.0.0-SNAPSHOT</ccsdk.oran.a1adapter.version>
-    </properties>
+        <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>
+        <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
+</properties>
 
     <dependencies>
         <dependency>
@@ -287,13 +289,6 @@
             <classifier>repo</classifier>
             <type>zip</type>
         </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-            <artifactId>a1Adapter-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <classifier>repo</classifier>
-            <type>zip</type>
-        </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.oran</groupId>
             <artifactId>a1-adapter-installer</artifactId>
@@ -308,6 +303,13 @@
             <classifier>repo</classifier>
             <type>zip</type>
         </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
+            <artifactId>ranSlice-installer</artifactId>
+            <version>${ccsdk.features.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
     </dependencies>
 
     <build>
@@ -332,7 +334,7 @@
                             <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <source>${basedir}/../../src/main/scripts/TagVersion.groovy</source>
+                            <source>${basedir}/../../src/main/scripts/TagSnapshotVersion.groovy</source>
                         </configuration>
                     </execution>
                 </executions>
@@ -549,8 +551,21 @@
                     </execution>
                 </executions>
             </plugin>
-
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                  <execution>
+                    <goals>
+                      <goal>integration-test</goal>
+                      <goal>verify</goal>
+                    </goals>
+                  </execution>
+                </executions>
+                <configuration>
+                  <skipITs>true</skipITs>
+                </configuration>
+              </plugin>
         </plugins>
     </build>
 
@@ -559,6 +574,24 @@
             <id>docker</id>
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <executions>
+                          <execution>
+                            <goals>
+                              <goal>integration-test</goal>
+                              <goal>verify</goal>
+                            </goals>
+                          </execution>
+                        </executions>
+                        <configuration>
+                          <skipITs>false</skipITs>
+                          <environmentVariables>
+                            <ODLSLI_PORT>${odlsli.port}</ODLSLI_PORT>
+                          </environmentVariables>
+                        </configuration>
+                      </plugin>
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
@@ -573,10 +606,11 @@
                                         <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                                         <dockerFile>Dockerfile</dockerFile>
                                         <tags>
-                                            <tag>${project.docker.latestminortag.version}</tag>
-                                            <tag>${project.docker.latestfulltag.version}</tag>
-                                            <tag>${project.docker.latesttagtimestamp.version}</tag>
-                                        </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>
@@ -589,7 +623,81 @@
                                     <goal>build</goal>
                                 </goals>
                             </execution>
-
+                            <execution>
+                                <id>start-it-instance</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start</goal>
+                                </goals>
+                                <configuration>
+                                    <images>
+                                        <image>
+                                            <name>mariadb:10.5</name>
+                                            <alias>odlsli-db</alias>
+                                            <run>
+                                                <env>
+                                                    <MYSQL_ROOT_PASSWORD>itsASecret</MYSQL_ROOT_PASSWORD>
+                                                    <MYSQL_USER>sdnctl</MYSQL_USER>
+                                                    <MYSQL_PASSWORD>gamma</MYSQL_PASSWORD>
+                                                    <MYSQL_DATABASE>sdnctl</MYSQL_DATABASE>
+                                                </env>
+                                                <network>
+                                                    <mode>custom</mode>
+                                                    <name>onap</name>
+                                                    <alias>dbhost</alias>
+                                                    <alias>sdnctldb01</alias>
+                                                    <alias>sdnctldb02</alias>
+                                                </network>
+                                                <ports>
+                                                    <port>odlslidb.port:3306</port>
+                                                </ports>
+                                                <log>
+                                                    <enabled>true</enabled>
+                                                </log>
+                                            </run>
+                                        </image>
+                                        <image>
+                                            <name>${image.name}:${project.docker.latesttagtimestamp.snapshot.version}</name>
+                                            <alias>odlsli-container</alias>
+                                            <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_CONFIG_DIR>/opt/onap/ccsdk/data/properties</SDNC_CONFIG_DIR>
+                                                    <KARAF_CONSOLE_LOG_LEVEL>INFO</KARAF_CONSOLE_LOG_LEVEL>
+                                                </env>
+                                                <dependsOn>
+                                                    <container>odlsli-db</container>
+                                                </dependsOn>
+                                                <network>
+                                                    <mode>custom</mode>
+                                                    <name>onap</name>
+                                                    <alias>odlsli</alias>
+                                                </network>&gt;
+                                                <ports>
+                                                    <port>odlsli.port:8181</port>
+                                                </ports>
+                                                <wait>
+                                                    <log>all warp coils are now operating at peak efficiency</log>
+                                                    <time>120000</time>
+                                                </wait>
+                                                <log>
+                                                    <enabled>true</enabled>
+                                                </log>
+                                            </run>
+                                        </image>
+                                    </images>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>stop-it-instance</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
                             <execution>
                                 <id>push-images</id>
                                 <phase>${docker.push.phase}</phase>