X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=integration-tests%2Fpom.xml;h=1675325ecbe7e30908ab0970e02e666786c81626;hb=21f652a75ecd4d1e16204fb78e638885197293d1;hp=c3745b69624d21f2bfd1f72cd06b7d1589f8a105;hpb=84f4b054a72b7d1dd44dec5d91623595e4563ab7;p=sdc.git
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index c3745b6962..1675325ecb 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -3,7 +3,7 @@
SDC
================================================================================
Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-Modifications copyright (c) 2020 Nokia
+Modifications copyright (c) 2020-2021 Nokia
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -32,12 +32,12 @@ limitations under the License.
org.openecomp.sdc
sdc-main
- 1.9.0-SNAPSHOT
+ 1.13.5-SNAPSHOT
3.141.59
- 0.29.0
+ 0.33.0
integration-test
9042
@@ -52,10 +52,12 @@ limitations under the License.
latest
86.0
true
- 1.2.0
+ true
+ 1.3.1
- 1.6.5
+ 1.9.0
+ false
@@ -77,18 +79,6 @@ limitations under the License.
${hamcrest.version}
test
-
- junit
- junit
- ${junit.version}
- test
-
-
- org.hamcrest
- hamcrest-core
-
-
-
org.testng
testng
@@ -106,25 +96,71 @@ limitations under the License.
catalog-model
${project.version}
test
+
+
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-servlet
+
+
org.openecomp.sdc.be
catalog-dao
${project.version}
test
+
+
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-servlet
+
+
org.openecomp.sdc
openecomp-sdc-vendor-software-product-manager
${project.version}
test
+
+
+ org.springframework
+ spring-core
+
+
com.aventstack
extentreports
3.0.6
test
+
+
+ org.jsoup
+ jsoup
+
+
+ org.apache.httpcomponents
+ httpmime
+
+
+ org.mongodb
+ mongodb-driver
+
+
+
+ org.mongodb
+ mongodb-driver
+ 3.12.10
+
+
org.janusgraph
janusgraph-core
@@ -132,8 +168,12 @@ limitations under the License.
test
+ org.apache.tinkerpop
gremlin-groovy
+
+
org.apache.tinkerpop
+ gremlin-core
slf4j-log4j12
@@ -155,6 +195,18 @@ limitations under the License.
org.apache.commons
commons-text
+
+ commons-codec
+ commons-codec
+
+
+ dom4j
+ dom4j
+
+
+ org.slf4j
+ jcl-over-slf4j
+
@@ -176,10 +228,20 @@ limitations under the License.
test
- org.apache.httpcomponents
- httpclient
+ org.apache.httpcomponents.client5
+ httpclient5
${httpclient.version}
test
+
+
+ commons-codec
+ commons-codec
+
+
+ org.apache.httpcomponents
+ httpcore
+
+
org.apache.httpcomponents
@@ -219,23 +281,50 @@ limitations under the License.
+
+ com.squareup.okhttp3
+ okhttp
+ ${okhttp.version}
+
org.seleniumhq.selenium
selenium-java
test
${selenium.version}
+
+
+ com.squareup.okhttp3
+ okhttp
+
+
org.seleniumhq.selenium
selenium-server
${selenium.version}
test
+
+
+ javax.servlet
+ javax.servlet-api
+
+
+ com.squareup.okhttp3
+ okhttp
+
+
org.seleniumhq.selenium
selenium-firefox-driver
${selenium.version}
test
+
+
+ com.squareup.okhttp3
+ okhttp
+
+
@@ -250,6 +339,14 @@ limitations under the License.
com.fasterxml.jackson.core
jackson-core
+
+ org.slf4j
+ jcl-over-slf4j
+
+
+ org.bouncycastle
+ *
+
@@ -263,6 +360,16 @@ limitations under the License.
proxy-vole
1.0.2
test
+
+
+ net.java.dev.jna
+ jna
+
+
+ net.java.dev.jna
+ jna-platform
+
+
commons-net
@@ -271,9 +378,47 @@ limitations under the License.
test
- org.apache.logging.log4j
- log4j-api
- 2.13.1
+ org.springframework
+ spring-core
+ ${spring.version}
+ test
+
+
+ org.onap.portal.sdk
+ epsdk-fw
+ ${ecomp.version}
+ test
+
+
+ log4j
+ log4j
+
+
+ org.owasp.esapi
+ esapi
+
+
+ javax.servlet
+ javax.servlet-api
+
+
+ org.onap.aaf.authz
+ aaf-cadi-aaf
+
+
+ org.onap.aaf.authz
+ aaf-cadi-client
+
+
+ org.onap.aaf.authz
+ aaf-cadi-core
+
+
+
+
+ org.functionaljava
+ functionaljava
+ ${functionaljava.version}
test
@@ -298,6 +443,12 @@ limitations under the License.
true
integration-test.json
+
+
+
+ environments
+ false
+
plugins-configuration.yaml
@@ -326,6 +477,72 @@ limitations under the License.
+
+ copy-normatives
+ pre-integration-test
+
+ copy-resources
+
+
+
+ integration-tests-init/chef-repo/cookbooks/sdc-integration-tests-setup/files/default
+
+
+
+ ${project.build.directory}
+
+ normatives.tar.gz
+
+
+
+
+
+
+ copy-sdc-be-py
+ pre-integration-test
+
+ copy-resources
+
+
+
+ integration-tests-init/
+
+
+
+
+ ${project.parent.basedir}/catalog-be/src/main/resources/
+
+
+ scripts/sdcBePy/**
+ scripts/setup.py
+
+
+
+
+
+
+ copy-be-configuration
+ pre-integration-test
+
+ copy-resources
+
+
+ true
+
+ integration-tests-init/
+
+
+
+
+ ${project.parent.basedir}/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/
+
+
+ BE-configuration.yaml.erb
+
+
+
+
+
@@ -387,6 +604,20 @@ limitations under the License.
run
+
+ add-test-model-to-config
+ pre-integration-test
+
+ run
+
+
+
+
+
+
+
+
+
@@ -407,23 +638,71 @@ limitations under the License.
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+ ${mvn.assembly.version}
+
+
+ normatives
+ prepare-package
+
+ single
+
+
+ normatives
+ false
+
+ src/main/assembly/normatives.xml
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-clean-plugin
+
+
+ clean.test.folder
+ clean
+
+ clean
+
+
+
+
+
+ integration-tests-init/chef-repo/cookbooks/sdc-integration-tests-setup/files/default
+
+ false
+
+ normatives.tar.gz
+
+
+
+
+
+
+
io.fabric8
docker-maven-plugin
- org.apache.httpcomponents
- httpclient
- 4.5.5
+ org.apache.httpcomponents.client5
+ httpclient5
+ ${httpclient.version}
${verbose}
${docker.api.version}
true
+ true
- onap/sdc-cassandra:${it.docker.version}
+ ${docker.namespace}/sdc-cassandra:${it.docker.version}
sdc-cassandra
@@ -473,7 +752,7 @@ limitations under the License.
- onap/sdc-cassandra-init:${it.docker.version}
+ ${docker.namespace}/sdc-cassandra-init:${it.docker.version}
sdc-cassandra-init
@@ -506,11 +785,11 @@ limitations under the License.
- onap/sdc-onboard-cassandra-init:${it.docker.version}
+ ${docker.namespace}/sdc-onboard-cassandra-init:${it.docker.version}
sdc-cassandra-onboard-init
- sdc-cassandra
+ sdc-cassandra-init
${project.version}
@@ -530,7 +809,7 @@ limitations under the License.
- Initializing onboard schemas
+ Onboarding init was successful
custom
@@ -540,10 +819,10 @@ limitations under the License.
- onap/sdc-onboard-backend:${it.docker.version}
+ ${docker.namespace}/sdc-onboard-backend:${it.docker.version}
sdc-onboard-backend
-
+
sdc-cassandra-onboard-init
@@ -593,7 +872,7 @@ limitations under the License.
- onap/sdc-backend-all-plugins:${it.docker.version}
+ ${docker.namespace}/sdc-backend-all-plugins:${it.docker.version}
sdc-backend
@@ -613,6 +892,9 @@ limitations under the License.
sdc-BE
+
+ ${project.basedir}/integration-tests-init/BE-configuration.yaml.erb:/app/jetty/chef-solo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
+
${it.chef.config}:/app/jetty/chef-solo/environments
${it.shared.volume}:/app/jetty/logs
@@ -645,7 +927,7 @@ limitations under the License.
- onap/sdc-backend-init:${it.docker.version}
+ ${docker.namespace}/sdc-backend-init:${it.docker.version}
sdc-backend-init
@@ -675,7 +957,7 @@ limitations under the License.
- onap/sdc-frontend:${it.docker.version}
+ ${docker.namespace}/sdc-frontend:${it.docker.version}
sdc-frontend
@@ -721,12 +1003,9 @@ limitations under the License.
- onap/sdc-simulator:${it.docker.version}
+ ${docker.namespace}/sdc-simulator:${it.docker.version}
sdc-simulator
-
- sdc-frontend
-
-Xmx128m -Xms128m -Xss1m
@@ -747,13 +1026,15 @@ limitations under the License.
8080
8443
+ 5000
- 8285:8080
+ 8285:8080
8286:8443
+ 5000:5000
custom
@@ -762,7 +1043,6 @@ limitations under the License.
-
selenium/standalone-firefox:${it.ui.firefox.version}
firefox-standalone
@@ -807,35 +1087,86 @@ limitations under the License.
-
- onap/org.onap.sdc.sdc-helm-validator:${it.helm-validator.version}
- helm-validator
-
- ${it.helm-validator.disabled}
- helm-validator
-
-
-
- helm-validator
- direct
-
- 8080
-
-
-
-
- 8085:8080
-
-
- custom
- sdc-network
+
+ ${docker.namespace}/sdc-helm-validator:${it.helm-validator.version}
helm-validator
-
-
-
+
+ ${it.helm-validator.disabled}
+ helm-validator
+
+
+
+ helm-validator
+ direct
+
+ 8080
+
+
+
+
+ 8085:8080
+
+
+ custom
+ sdc-network
+ helm-validator
+
+
+
+
+ ${docker.namespace}/sdc-integration-tests-init
+ integration-tests-init
+
+ ${it.test-model.disabled}
+ try
+ ${project.basedir}/integration-tests-init
+
+ latest
+
+ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+
+
+ ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}
+
+
+
+
+ ${it.test-model.disabled}
+
+ sdc-backend-init
+
+
+ ${it.env.name}
+
+ integration-tests-init
+
+
+
+ ${it.chef.config}:/home/onap/chef-solo/environments
+
+
+
+
+
+ Chef Client finished
+
+
+ custom
+ sdc-network
+ sdc-integration-tests-init
+
+
+
+
+ docker-build-for-it
+ pre-integration-test
+
+ build
+
+
docker-start-for-it
pre-integration-test
@@ -852,7 +1183,6 @@ limitations under the License.
-
org.apache.maven.plugins
maven-surefire-plugin
@@ -860,19 +1190,15 @@ limitations under the License.
true
-
org.apache.maven.plugins
maven-failsafe-plugin
1
true
-
-
- testng.dtd.http
- true
-
-
+
+ true
+
src/test/resources/ci/testSuites/backend/onapApiSanity.xml
src/test/resources/ci/testSuites/frontend/onapUiSanity.xml
@@ -903,17 +1229,25 @@ limitations under the License.
+
+ add-test-model
+
+ false
+
+
all-for-integration-tests-only
true
false
+ false
integration-tests-with-helm-validator
false
+ false
@@ -923,12 +1257,9 @@ limitations under the License.
1
true
-
-
- testng.dtd.http
- true
-
-
+
+ true
+
src/test/resources/ci/testSuites/backend/onapApiSanity.xml
src/test/resources/ci/testSuites/frontend/onapUiSanity.xml
@@ -940,5 +1271,63 @@ limitations under the License.
+
+ run-integration-tests-api
+
+ false
+ true
+ true
+ true
+ false
+
+
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+
+ 1
+ true
+
+ true
+
+
+ src/test/resources/ci/testSuites/backend/onapApiSanity.xml
+ src/test/resources/ci/testSuites/backend/helmValidatorTests.xml
+
+
+
+
+
+
+
+ run-integration-tests-ui
+
+ false
+ true
+ true
+ true
+ false
+
+
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+
+ 1
+ true
+
+ true
+
+
+ src/test/resources/ci/testSuites/frontend/onapUiSanity.xml
+ src/test/resources/ci/testSuites/frontend/helmValidatorTests.xml
+
+
+
+
+
+