Merge "Update installation to handle case /etc/ssl/certs not found"

Former-commit-id: d783393be7834728e8919a5b12828613c7879ff9

3 files changed, 99 insertions, 7 deletions

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index a0c42a44..ae7c9dda 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -31,7 +31,8 @@
         <sdnc.secureport>8443</sdnc.secureport>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <docker.push.phase>deploy</docker.push.phase>
-        <docker.verbose>true</docker.verbose>
+        <docker.verbose>true</docker.verbose> 
+        <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
 
@@ -117,6 +118,81 @@
                           </configuration>
                     </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>sdnc-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>sdnc</name>
+                                            <alias>dbhost</alias>
+                                            <alias>sdnctldb01</alias>
+                                            <alias>sdnctldb02</alias>
+                                        </network>
+                                        <ports>
+                                            <port>sdncdb.port:3306</port>
+                                        </ports>
+                                        <log>
+                                            <enabled>true</enabled>
+                                        </log>
+                                    </run>
+                                </image>
+                                <image>
+                                    <name>${image.name}:${project.docker.latesttagtimestamp.version}</name>
+                                    <alias>sdnc-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/sdnc/data/properties</SDNC_CONFIG_DIR>
+                                            <KARAF_CONSOLE_LOG_LEVEL>INFO</KARAF_CONSOLE_LOG_LEVEL>
+                                        </env>
+                                        <dependsOn>
+                                            <container>sdnc-db</container>
+                                        </dependsOn>
+                                        <network>
+                                            <mode>custom</mode>
+                                            <name>sdnc</name>
+                                            <alias>sdnc</alias>
+                                        </network>>
+                                        <ports>
+                                            <port>sdnc.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>
                       <goals>
@@ -401,6 +477,24 @@
                     </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>false</skipITs>
+                  <environmentVariables>
+                    <SDNC_PORT>${sdnc.port}</SDNC_PORT>
+                  </environmentVariables>
+                </configuration>
+              </plugin>
         </plugins>
     </build>
 </project>
diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index a4768ba5..4ff33ace 100755
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -46,10 +46,9 @@ COPY aaa-app-config.xml $ODL_HOME/etc/opendaylight/datastore/initial/config/
 RUN echo "cadi_prop_files=$SDNC_CONFIG_DIR/org.onap.sdnc.props" >> $ODL_HOME/etc/system.properties
 
 # Install ssl and java certificates
-COPY truststoreONAPall.jks $JAVA_SECURITY_DIR
 COPY truststoreONAPall.jks $SDNC_STORE_DIR
-RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts  -deststorepass changeit -noprompt
-RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore /opt/java/openjdk/lib/security/cacerts  -deststorepass changeit -noprompt
+RUN if [ -f $JAVA_SECURITY_DIR}/cacerts ] ; then keytool -importkeystore -srckeystore $SDNC_STORE_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts  -deststorepass changeit -noprompt ; fi
+RUN keytool -importkeystore -srckeystore $SDNC_STORE_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore /opt/java/openjdk/lib/security/cacerts  -deststorepass changeit -noprompt
 
 # Secure with TLS
 RUN echo org.osgi.service.http.secure.enabled=true >> $ODL_HOME/etc/custom.properties
diff --git a/installation/sdnc/src/main/docker/standalone.Dockerfile b/installation/sdnc/src/main/docker/standalone.Dockerfile
index 58907dc1..5f0f8254 100755
--- a/installation/sdnc/src/main/docker/standalone.Dockerfile
+++ b/installation/sdnc/src/main/docker/standalone.Dockerfile
@@ -44,10 +44,9 @@ RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all, sdnr-northbound
 RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 
 # Install ssl and java certificates
-COPY truststoreONAPall.jks $JAVA_SECURITY_DIR
 COPY truststoreONAPall.jks $SDNC_STORE_DIR
-RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts  -deststorepass changeit -noprompt
-RUN keytool -importkeystore -srckeystore $JAVA_SECURITY_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore /opt/java/openjdk/lib/security/cacerts  -deststorepass changeit -noprompt
+RUN if [ -f $JAVA_SECURITY_DIR}/cacerts ] ; then keytool -importkeystore -srckeystore $SDNC_STORE_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts  -deststorepass changeit -noprompt ; fi
+RUN keytool -importkeystore -srckeystore $SDNC_STORE_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore /opt/java/openjdk/lib/security/cacerts  -deststorepass changeit -noprompt
 
 
 # Secure with TLS