summaryrefslogtreecommitdiffstats
path: root/integration-tests
diff options
context:
space:
mode:
authorsebdet <sebastien.determe@intl.att.com>2020-09-21 22:13:05 +0200
committerMichael Morris <michael.morris@est.tech>2021-05-12 10:27:10 +0000
commitdf353be353e1ec25ac2a0e64a9eb617dcbc87703 (patch)
treee79c636bc4f67bdd8392b24c85f2f6cb26e3c67a /integration-tests
parent936781153118364e60662529dbd7217416a26148 (diff)
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>
Diffstat (limited to 'integration-tests')
-rw-r--r--integration-tests/pom.xml35
1 files changed, 15 insertions, 20 deletions
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>