From dcda40f7bc372178bb76e0810a90e2f03783754a Mon Sep 17 00:00:00 2001 From: sebdet Date: Mon, 24 Aug 2020 12:00:48 +0200 Subject: Add sdc startup in IT Rework the java packages so that we use onap now + fix the folders written outside of the target folder Issue-ID: SDC-3232 Signed-off-by: sebdet Change-Id: I23c2bad4bee6b766cfacc2c544e1431aed4cd608 --- .../src/test/resources/ci/conf/testngLifeCycle.xml | 9 ---- .../test/resources/ci/testSuites/CRUDArtifacts.xml | 2 +- .../resources/ci/testSuites/ExternalApiSanity.xml | 16 +++---- .../resources/ci/testSuites/SearchExternalAPI.xml | 2 +- .../src/test/resources/ci/testSuites/artifacts.xml | 6 +-- .../src/test/resources/ci/testSuites/cap_req.xml | 4 +- .../src/test/resources/ci/testSuites/category.xml | 4 +- .../src/test/resources/ci/testSuites/ciFull.xml | 44 +++++++++---------- .../test/resources/ci/testSuites/externalAPIs.xml | 32 +++++++------- .../src/test/resources/ci/testSuites/general.xml | 2 +- .../src/test/resources/ci/testSuites/imports.xml | 2 +- .../test/resources/ci/testSuites/normatives.xml | 2 +- .../test/resources/ci/testSuites/onapApiSanity.xml | 2 +- .../src/test/resources/ci/testSuites/pass.xml | 2 +- .../src/test/resources/ci/testSuites/product.xml | 8 ++-- .../test/resources/ci/testSuites/productAPIs.xml | 10 ++--- .../src/test/resources/ci/testSuites/property.xml | 4 +- .../src/test/resources/ci/testSuites/resource.xml | 36 ++++++++-------- .../src/test/resources/ci/testSuites/sanity.xml | 50 +++++++++++----------- .../src/test/resources/ci/testSuites/service.xml | 4 +- .../resources/ci/testSuites/testngLifeCycle.xml | 4 +- .../src/test/resources/ci/testSuites/user.xml | 2 +- 22 files changed, 119 insertions(+), 128 deletions(-) delete mode 100644 integration-tests/src/test/resources/ci/conf/testngLifeCycle.xml (limited to 'integration-tests/src/test/resources') diff --git a/integration-tests/src/test/resources/ci/conf/testngLifeCycle.xml b/integration-tests/src/test/resources/ci/conf/testngLifeCycle.xml deleted file mode 100644 index 005bdba0f3..0000000000 --- a/integration-tests/src/test/resources/ci/conf/testngLifeCycle.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/integration-tests/src/test/resources/ci/testSuites/CRUDArtifacts.xml b/integration-tests/src/test/resources/ci/testSuites/CRUDArtifacts.xml index 923777542c..0306e469ea 100644 --- a/integration-tests/src/test/resources/ci/testSuites/CRUDArtifacts.xml +++ b/integration-tests/src/test/resources/ci/testSuites/CRUDArtifacts.xml @@ -5,7 +5,7 @@ + name="org.onap.sdc.backend.externalApis.CRUDExternalAPI"> diff --git a/integration-tests/src/test/resources/ci/testSuites/cap_req.xml b/integration-tests/src/test/resources/ci/testSuites/cap_req.xml index 8298af2da5..9b1c6e54d3 100644 --- a/integration-tests/src/test/resources/ci/testSuites/cap_req.xml +++ b/integration-tests/src/test/resources/ci/testSuites/cap_req.xml @@ -3,8 +3,8 @@ - - + + diff --git a/integration-tests/src/test/resources/ci/testSuites/category.xml b/integration-tests/src/test/resources/ci/testSuites/category.xml index 3de83431e8..ef2c26fa5f 100644 --- a/integration-tests/src/test/resources/ci/testSuites/category.xml +++ b/integration-tests/src/test/resources/ci/testSuites/category.xml @@ -3,8 +3,8 @@ - - + + diff --git a/integration-tests/src/test/resources/ci/testSuites/ciFull.xml b/integration-tests/src/test/resources/ci/testSuites/ciFull.xml index 7a9558ed7a..963c568a8f 100644 --- a/integration-tests/src/test/resources/ci/testSuites/ciFull.xml +++ b/integration-tests/src/test/resources/ci/testSuites/ciFull.xml @@ -3,8 +3,8 @@ - - + + @@ -12,7 +12,7 @@ - + @@ -24,9 +24,9 @@ + name="org.onap.sdc.backend.ci.tests.execute.distribution.AuthanticationTests"/> + name="org.onap.sdc.backend.ci.tests.execute.distribution.DistributionDownloadArtifactTest"> @@ -35,44 +35,44 @@ - - + + - - + + - - + + + name="org.onap.sdc.backend.ci.tests.execute.resource.ValidateExtendedVfData"/> + name="org.onap.sdc.backend.ci.tests.execute.product.ProductUndoCheckoutTest"> + name="org.onap.sdc.backend.ci.tests.execute.product.ProductGetFollowedTest"/> - + name="org.onap.sdc.backend.ci.tests.execute.product.ProductToscaYamlGenerationTest"/> + - + + name="org.onap.sdc.backend.ci.tests.execute.product.ProductCreateWithValidationsTest"> @@ -84,14 +84,14 @@ - + - - - + + + \ No newline at end of file diff --git a/integration-tests/src/test/resources/ci/testSuites/externalAPIs.xml b/integration-tests/src/test/resources/ci/testSuites/externalAPIs.xml index 7c9d6d9d9c..637ec3e4fa 100644 --- a/integration-tests/src/test/resources/ci/testSuites/externalAPIs.xml +++ b/integration-tests/src/test/resources/ci/testSuites/externalAPIs.xml @@ -4,28 +4,28 @@ - - - - - - - - - - + + + + + + + + + + - + + + --> diff --git a/integration-tests/src/test/resources/ci/testSuites/general.xml b/integration-tests/src/test/resources/ci/testSuites/general.xml index a63f36423e..9ee63871bf 100644 --- a/integration-tests/src/test/resources/ci/testSuites/general.xml +++ b/integration-tests/src/test/resources/ci/testSuites/general.xml @@ -3,7 +3,7 @@ - + diff --git a/integration-tests/src/test/resources/ci/testSuites/imports.xml b/integration-tests/src/test/resources/ci/testSuites/imports.xml index b9374cf47a..56d9010383 100644 --- a/integration-tests/src/test/resources/ci/testSuites/imports.xml +++ b/integration-tests/src/test/resources/ci/testSuites/imports.xml @@ -3,7 +3,7 @@ - + diff --git a/integration-tests/src/test/resources/ci/testSuites/normatives.xml b/integration-tests/src/test/resources/ci/testSuites/normatives.xml index 02da714578..8e633e2bac 100644 --- a/integration-tests/src/test/resources/ci/testSuites/normatives.xml +++ b/integration-tests/src/test/resources/ci/testSuites/normatives.xml @@ -19,7 +19,7 @@ - + \ No newline at end of file diff --git a/integration-tests/src/test/resources/ci/testSuites/onapApiSanity.xml b/integration-tests/src/test/resources/ci/testSuites/onapApiSanity.xml index 9fcd043cd3..9f189107a5 100644 --- a/integration-tests/src/test/resources/ci/testSuites/onapApiSanity.xml +++ b/integration-tests/src/test/resources/ci/testSuites/onapApiSanity.xml @@ -5,7 +5,7 @@ - + \ No newline at end of file diff --git a/integration-tests/src/test/resources/ci/testSuites/pass.xml b/integration-tests/src/test/resources/ci/testSuites/pass.xml index 731d73675c..00df382cef 100644 --- a/integration-tests/src/test/resources/ci/testSuites/pass.xml +++ b/integration-tests/src/test/resources/ci/testSuites/pass.xml @@ -7,7 +7,7 @@ + name="org.onap.sdc.backend.ci.tests.sanity.Onboard"> diff --git a/integration-tests/src/test/resources/ci/testSuites/product.xml b/integration-tests/src/test/resources/ci/testSuites/product.xml index 101b94a6bb..559fc54514 100644 --- a/integration-tests/src/test/resources/ci/testSuites/product.xml +++ b/integration-tests/src/test/resources/ci/testSuites/product.xml @@ -3,10 +3,10 @@ - - - - + + + + diff --git a/integration-tests/src/test/resources/ci/testSuites/productAPIs.xml b/integration-tests/src/test/resources/ci/testSuites/productAPIs.xml index df9aa9f152..bd5f06da15 100644 --- a/integration-tests/src/test/resources/ci/testSuites/productAPIs.xml +++ b/integration-tests/src/test/resources/ci/testSuites/productAPIs.xml @@ -5,11 +5,11 @@ - - - - - + + + + + \ No newline at end of file diff --git a/integration-tests/src/test/resources/ci/testSuites/property.xml b/integration-tests/src/test/resources/ci/testSuites/property.xml index b7dba95f16..cb8875ac64 100644 --- a/integration-tests/src/test/resources/ci/testSuites/property.xml +++ b/integration-tests/src/test/resources/ci/testSuites/property.xml @@ -3,8 +3,8 @@ - - + + diff --git a/integration-tests/src/test/resources/ci/testSuites/resource.xml b/integration-tests/src/test/resources/ci/testSuites/resource.xml index 4fd0e43a02..c2dd49011c 100644 --- a/integration-tests/src/test/resources/ci/testSuites/resource.xml +++ b/integration-tests/src/test/resources/ci/testSuites/resource.xml @@ -5,30 +5,30 @@ - + - + + name="org.onap.sdc.backend.ci.tests.execute.distribution.DistributionDownloadArtifactTest"> - + - + - + @@ -36,7 +36,7 @@ - + @@ -44,66 +44,66 @@ - + - + - + - + - + - + - + - + - + - + - + diff --git a/integration-tests/src/test/resources/ci/testSuites/sanity.xml b/integration-tests/src/test/resources/ci/testSuites/sanity.xml index 320c3ccd43..09323f2ea2 100644 --- a/integration-tests/src/test/resources/ci/testSuites/sanity.xml +++ b/integration-tests/src/test/resources/ci/testSuites/sanity.xml @@ -4,14 +4,14 @@ - + - - + + @@ -27,7 +27,7 @@ + name="org.onap.sdc.backend.ci.tests.execute.artifacts.DownloadComponentArt"> @@ -39,7 +39,7 @@ + name="org.onap.sdc.backend.ci.tests.execute.service.GetComponentAuditApiTest"> @@ -51,20 +51,20 @@ + name="org.onap.sdc.backend.ci.tests.execute.resource.GetAllResourceVersions"> - + + name="org.onap.sdc.backend.ci.tests.execute.resource.UpdateResourceMetadataTest"> @@ -73,24 +73,24 @@ - + - + + name="org.onap.sdc.backend.ci.tests.execute.product.ProductGetFollowedTest"> + name="org.onap.sdc.backend.ci.tests.execute.product.ProductUndoCheckoutTest"> @@ -100,21 +100,21 @@ - + + name="org.onap.sdc.backend.ci.tests.execute.distribution.AuthanticationTests"> + name="org.onap.sdc.backend.ci.tests.execute.distribution.DistributionDownloadArtifactTest"> @@ -130,7 +130,7 @@ + name="org.onap.sdc.backend.ci.tests.execute.imports.ImportGenericResourceCITest"> @@ -138,7 +138,7 @@ + name="org.onap.sdc.backend.ci.tests.execute.imports.ImportToscaCapabilitiesWithProperties"> + name="org.onap.sdc.backend.ci.tests.execute.attribute.ComponentInstanceAttributeTest"> @@ -162,7 +162,7 @@ + name="org.onap.sdc.backend.ci.tests.execute.inputs.InputsApiTests"> @@ -173,7 +173,7 @@ + name="org.onap.sdc.backend.ci.tests.execute.property.AdditionalInformationServletTest"> @@ -181,12 +181,12 @@ - + - + @@ -203,18 +203,18 @@ - + - + - + - - + + diff --git a/integration-tests/src/test/resources/ci/testSuites/testngLifeCycle.xml b/integration-tests/src/test/resources/ci/testSuites/testngLifeCycle.xml index 7f1cba4d9c..9ae3cfda21 100644 --- a/integration-tests/src/test/resources/ci/testSuites/testngLifeCycle.xml +++ b/integration-tests/src/test/resources/ci/testSuites/testngLifeCycle.xml @@ -1,9 +1,9 @@ - + - + diff --git a/integration-tests/src/test/resources/ci/testSuites/user.xml b/integration-tests/src/test/resources/ci/testSuites/user.xml index 3ab1f971fb..ddd90b1aa8 100644 --- a/integration-tests/src/test/resources/ci/testSuites/user.xml +++ b/integration-tests/src/test/resources/ci/testSuites/user.xml @@ -3,7 +3,7 @@ - + -- cgit 1.2.3-korg