From df353be353e1ec25ac2a0e64a9eb617dcbc87703 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Mon, 21 Sep 2020 22:13:05 +0200
Subject: Use integration-java11 Dockerfile

Use onap/integration-java11:7.1.0 as a source for the images requiring JDK 11 in SDC

Issue-ID: SDC-3298
Change-Id: Ifee3d2942dcb9c078f2ebb686bdabc0ecca857b3
Signed-off-by: xuegao <xue.gao@intl.att.com>
---
 integration-tests/pom.xml | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

(limited to 'integration-tests')

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 866e2ee80a..87761e6f0c 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -406,7 +406,7 @@ limitations under the License.
                     </dependency>
                 </dependencies>
                 <configuration>
-                    <verbose>true</verbose>
+                    <verbose>${verbose}</verbose>
                     <apiVersion>${docker.api.version}</apiVersion>
                     <autoCreateCustomNetworks>true</autoCreateCustomNetworks>
                     <images>
@@ -479,6 +479,7 @@ limitations under the License.
                                     <bind>
                                         <volume>${it.chef.config}:/home/sdc/chef-solo/environments
                                         </volume>
+
                                     </bind>
                                 </volumes>
                                 <wait>
@@ -549,13 +550,10 @@ limitations under the License.
                                 <hostname>sdc-onboard-BE</hostname>
                                 <volumes>
                                     <bind>
-                                        <volume>
-                                            ${it.chef.config}:/var/lib/jetty/chef-solo/environments
-                                        </volume>
-                                        <volume>
-                                            ${project.basedir}/src/test/resources/cert/onboarding-be:/var/lib/jetty/onap/cert
+                                        <volume>${it.chef.config}:/app/jetty/chef-solo/environments</volume>
+                                        <volume>${project.basedir}/src/test/resources/cert/onboarding-be:/app/jetty/onap/cert
                                         </volume>
-                                        <volume>${it.shared.volume}:/var/lib/jetty/logs</volume>
+                                        <volume>${it.shared.volume}:/app/jetty/logs</volume>
                                     </bind>
                                 </volumes>
                                 <wait>
@@ -603,12 +601,10 @@ limitations under the License.
                                 <hostname>sdc-BE</hostname>
                                 <volumes>
                                     <bind>
+                                        <volume>${it.chef.config}:/app/jetty/chef-solo/environments</volume>
+                                        <volume>${it.shared.volume}:/app/jetty/logs</volume>
                                         <volume>
-                                            ${it.chef.config}:/var/lib/jetty/chef-solo/environments
-                                        </volume>
-                                        <volume>${it.shared.volume}:/var/lib/jetty/logs</volume>
-                                        <volume>
-                                            ${project.basedir}/src/test/resources/cert/catalog-be:/var/lib/jetty/onap/cert
+                                            ${project.basedir}/src/test/resources/cert/catalog-be:/app/jetty/onap/cert
                                         </volume>
                                     </bind>
                                 </volumes>
@@ -652,7 +648,7 @@ limitations under the License.
                                         <volume>
                                             ${it.chef.config}:/home/onap/chef-solo/environments
                                         </volume>
-                                        <volume>${it.shared.volume}:/var/lib/jetty/logs</volume>
+                                        <volume>${it.shared.volume}:/home/onap/logs</volume>
                                     </bind>
                                 </volumes>
                                 <wait>
@@ -680,13 +676,12 @@ limitations under the License.
                                 <hostname>sdc-FE</hostname>
                                 <volumes>
                                     <bind>
+                                        <volume>${it.chef.config}:/app/jetty/chef-solo/environments</volume>
+                                        <volume>${it.shared.volume}:/app/jetty/logs</volume>
                                         <volume>
-                                            ${it.chef.config}:/var/lib/jetty/chef-solo/environments
-                                        </volume>
-                                        <volume>${it.shared.volume}:/var/lib/jetty/logs</volume>
-                                        <volume>
-                                            ${it.chef.config}/plugins-configuration.yaml:/var/lib/jetty/config/catalog-fe/plugins-configuration.yaml
+                                            ${it.chef.config}/plugins-configuration.yaml:/app/jetty/config/catalog-fe/plugins-configuration.yaml
                                         </volume>
+
                                     </bind>
                                 </volumes>
                                 <wait>
@@ -728,8 +723,8 @@ limitations under the License.
                                 <hostname>sdc-sim</hostname>
                                 <volumes>
                                     <bind>
-                                        <volume>${it.chef.config}:/root/chef-solo/environments
-                                        </volume>
+                                        <volume>${it.chef.config}:/app/jetty/chef-solo/environments</volume>
+                                        <volume>${it.shared.volume}:/app/jetty/logs</volume>
                                     </bind>
                                 </volumes>
                                 <wait>
-- 
cgit 1.2.3-korg