X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=integration-tests%2Fpom.xml;h=801e21527f1bae6bdd4decdf74fd466536bfc4b8;hb=e5ce5b1b72e9421ba4bb772c41215e837f7517dd;hp=a5d719576137affa4d64a1bb776f6ca1f0ef3a80;hpb=a8a5863cfb100d4cbbecd0aefe5512234e101d97;p=sdc.git
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index a5d7195761..801e21527f 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -32,12 +32,12 @@ limitations under the License.
org.openecomp.sdc
sdc-main
- 1.10.0-SNAPSHOT
+ 1.13.3-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.2
+ true
+ 1.3.1
- 1.6.6
+ 1.8.0
+ false
@@ -94,12 +96,32 @@ 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
@@ -146,8 +168,12 @@ limitations under the License.
test
+ org.apache.tinkerpop
gremlin-groovy
+
+
org.apache.tinkerpop
+ gremlin-core
slf4j-log4j12
@@ -202,8 +228,8 @@ limitations under the License.
test
- org.apache.httpcomponents
- httpclient
+ org.apache.httpcomponents.client5
+ httpclient5
${httpclient.version}
test
@@ -255,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
+
+
@@ -290,6 +343,10 @@ limitations under the License.
org.slf4j
jcl-over-slf4j
+
+ org.bouncycastle
+ *
+
@@ -333,11 +390,37 @@ limitations under the License.
test
- log4j
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
+
@@ -360,6 +443,12 @@ limitations under the License.
true
integration-test.json
+
+
+
+ environments
+ false
+
plugins-configuration.yaml
@@ -388,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
+
+
+
+
+
@@ -449,6 +604,20 @@ limitations under the License.
run
+
+ add-test-model-to-config
+ pre-integration-test
+
+ run
+
+
+
+
+
+
+
+
+
@@ -469,13 +638,60 @@ 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
+ org.apache.httpcomponents.client5
+ httpclient5
${httpclient.version}
@@ -676,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
@@ -824,7 +1043,6 @@ limitations under the License.
-
selenium/standalone-firefox:${it.ui.firefox.version}
firefox-standalone
@@ -870,7 +1088,7 @@ limitations under the License.
- ${docker.namespace}/org.onap.sdc.sdc-helm-validator:${it.helm-validator.version}
+ ${docker.namespace}/sdc-helm-validator:${it.helm-validator.version}
helm-validator
${it.helm-validator.disabled}
@@ -895,9 +1113,60 @@ limitations under the License.
+
+ ${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
@@ -914,7 +1183,6 @@ limitations under the License.
-
org.apache.maven.plugins
maven-surefire-plugin
@@ -922,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
@@ -965,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
@@ -985,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
@@ -1002,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
+
+
+
+
+
+