diff options
Diffstat (limited to 'ui-ci/src/main/resources/ci')
6 files changed, 54 insertions, 10 deletions
diff --git a/ui-ci/src/main/resources/ci/conf/attsdc.yaml b/ui-ci/src/main/resources/ci/conf/attsdc.yaml index 4dd7e75abd..9537cf5360 100644 --- a/ui-ci/src/main/resources/ci/conf/attsdc.yaml +++ b/ui-ci/src/main/resources/ci/conf/attsdc.yaml @@ -1,12 +1,15 @@ outputFolder: target reportName: index.html -#catalogBeHost: 127.0.0.1 +catalogBeHost: 127.0.0.1 #Automate #catalogBeHost: 135.63.125.67 #catalogFeHost: 135.63.125.63 #IFT -catalogBeHost: 135.21.143.248 -catalogFeHost: 135.21.125.96 +#catalogBeHost: 135.21.143.248 +#catalogFeHost: 135.21.125.96 +#QA-SCRUM1 +#catalogBeHost: 135.21.125.97 +#catalogFeHost: 135.21.125.89 esHost: eshost disributionClientHost: disClient catalogFePort: 8181 @@ -17,9 +20,10 @@ neoHost: neoHost neoPort: 7474 neoDBusername: neo4j neoDBpassword: 123456 -#url: http://localhost:8285/sdc1 +url: http://localhost:8285/sdc1 #url: https://www.e-access.att.com/QA-AUTOMATE1/sdc1/portal -url: https://www.e-access.att.com/AA-IFT-testing/sdc1/portal +#url: https://www.e-access.att.com/AA-IFT-testing/sdc1/portal +#url: https://www.e-access.att.com/QA-SCRUM1/sdc1/portal remoteTestingMachineIP: 0.0.0.0 remoteTestingMachinePort: 5566 remoteTesting: false @@ -32,7 +36,7 @@ configurationFile: ../catalog-be/src/main/resources/config/configuration.yaml importTypesConfigDir: src/test/resources/CI/importTypesTest browser: FireFox windowsDownloadDirectory: "c:\\apache-ftpserver-1.1.0\\res\\home\\" -systemUnderDebug: true +systemUnderDebug: false reportDBhost: dbhost reportDBport: 27017 diff --git a/ui-ci/src/main/resources/ci/scripts/startTest.sh b/ui-ci/src/main/resources/ci/scripts/startTest.sh index a0de1fa56d..8bf35a5d88 100644 --- a/ui-ci/src/main/resources/ci/scripts/startTest.sh +++ b/ui-ci/src/main/resources/ci/scripts/startTest.sh @@ -102,7 +102,7 @@ if [ ${REMOTE_DEBUG} == "true" ]; then JAVA_OPTION="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${debug_port}" ; fi -cmd="java -Xmx2048m -Xms1024m $JAVA_OPTION -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -Dfilepath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -cp $JAR_FILE ${MainClass} $SUITE_FILE &" +cmd="java -Xmx2048m -Xms1024m $JAVA_OPTION -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -DfilePath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -cp $JAR_FILE ${MainClass} $SUITE_FILE &" if [ $DEBUG == "true" ] @@ -117,7 +117,7 @@ if [ ${RERUN} == "true" ]; then echo "Prepare" ${TARGET_DIR}/${fileName} "file to rerun all failed tests ..."; prepareFailedXmlFile ${TARGET_DIR}/${fileName} $SUITE_FILE; SUITE_FILE=${fileName}; - cmd="java -Xmx2048m -Xms1024m $JAVA_OPTION -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -Dfilepath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -cp $JAR_FILE ${MainClass} $SUITE_FILE &" + cmd="java -Xmx2048m -Xms1024m $JAVA_OPTION -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -DfilePath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -cp $JAR_FILE ${MainClass} $SUITE_FILE &" $cmd; fi fi diff --git a/ui-ci/src/main/resources/ci/testSuites/devOnboardE2EOneFileSanity.xml b/ui-ci/src/main/resources/ci/testSuites/devOnboardE2EOneFileSanity.xml new file mode 100644 index 0000000000..73ddc90cf3 --- /dev/null +++ b/ui-ci/src/main/resources/ci/testSuites/devOnboardE2EOneFileSanity.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> +<suite name="uitests" configfailurepolicy="continue"> + <test name="uitests"> + <classes> + <!--onboard--> + <class name="org.openecomp.sdc.ci.tests.execute.sanity.Onboard"> + <methods> + <include name="onboardVNFTestSanityOneFile"/> + </methods> + </class> + </classes> + </test> <!-- uitests --> +</suite> <!-- uisuite -->
\ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml b/ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml index 36993e382c..87a52bde7a 100644 --- a/ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml +++ b/ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml @@ -6,11 +6,17 @@ <test name="uiSanity"> <classes> + <class name="org.openecomp.sdc.ci.tests.dataProvider.OnbordingDataProviders"> + <methods> + <include name="OnbordingDataProviders"/> + </methods> + </class> <class name="org.openecomp.sdc.ci.tests.execute.sanity.Onboard"> <methods> <exclude name="onboardVNFTestSanity"/> <exclude name="onboardVNFShotFlow"/> - <exclude name="onboardRandomVNFsTest"/> + <exclude name="onboardVNFTest"/> + <exclude name="onboardVNFTestSanityOneFile"/> </methods> </class> <class name="org.openecomp.sdc.ci.tests.execute.sanity.CatalogLeftPanelTest"/> @@ -23,12 +29,16 @@ <class name="org.openecomp.sdc.ci.tests.execute.sanity.VfArtifacts"/> <class name="org.openecomp.sdc.ci.tests.execute.sanity.VfDeploymentInformationalArtifacts"/> <class name="org.openecomp.sdc.ci.tests.execute.sanity.AdminUserManagment"/> + <class name="org.openecomp.sdc.ci.tests.execute.sanity.PNF"/> + <class name="org.openecomp.sdc.ci.tests.execute.sanity.PropertiesAssignment"/> <!-- <class name="org.openecomp.sdc.ci.tests.execute.sanity.Product"/> --> <class name="org.openecomp.sdc.ci.tests.US.ImportUpdateInformationalDeploymentArtifacts"/> <class name="org.openecomp.sdc.ci.tests.US.MIBsArtifactsOnResourceInstance"/> <class name="org.openecomp.sdc.ci.tests.US.NewArtifactTypeGuide"/> <class name="org.openecomp.sdc.ci.tests.US.RemoveRestrictionOfDeploymentArtifacts"/> + <class name="org.openecomp.sdc.ci.tests.execute.sanity.OnboardingFlows"/> + <class name="org.openecomp.sdc.ci.tests.execute.sanity.PortMirroring"/> <!-- <class name="org.openecomp.sdc.ci.tests.US.AddComponentInstancesArtifactsInCsar"/> --> diff --git a/ui-ci/src/main/resources/ci/testSuites/onboardVNFWithoutDistribution.xml b/ui-ci/src/main/resources/ci/testSuites/onboardVNFWithoutDistribution.xml new file mode 100644 index 0000000000..54c4ea854b --- /dev/null +++ b/ui-ci/src/main/resources/ci/testSuites/onboardVNFWithoutDistribution.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> +<suite name="uitests" configfailurepolicy="continue" parallel="methods" thread-count="1" data-provider-thread-count="1"> + <parameter name="makeDistribution" value="false"/> + <parameter name="eraseAfterTests" value="false"/> + + <test name="uiSanity"> + <classes> + <class name="org.openecomp.sdc.ci.tests.execute.sanity.Onboard"> + <methods> + <include name="onboardVNFTestSanity"/> + </methods> + </class> + </classes> + </test> <!-- uitests --> +</suite> <!-- uisuite -->
\ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/testSuites/toscaValidationSuite.xml b/ui-ci/src/main/resources/ci/testSuites/toscaValidationSuite.xml index 6114517c8f..96c538dfc9 100644 --- a/ui-ci/src/main/resources/ci/testSuites/toscaValidationSuite.xml +++ b/ui-ci/src/main/resources/ci/testSuites/toscaValidationSuite.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> -<suite name="uitests" configfailurepolicy="continue" parallel="instances" thread-count="2" data-provider-thread-count="2"> +<suite name="uitests" configfailurepolicy="continue" parallel="methods" thread-count="2" data-provider-thread-count="2"> <parameter name="makeDistribution" value="false"/> <test name="OnbordingDataProviders"> |