diff options
Diffstat (limited to 'ui-ci/src/main/resources')
5 files changed, 45 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 1ab581cada..4dd7e75abd 100644 --- a/ui-ci/src/main/resources/ci/conf/attsdc.yaml +++ b/ui-ci/src/main/resources/ci/conf/attsdc.yaml @@ -1,7 +1,12 @@ outputFolder: target reportName: index.html -catalogBeHost: 127.0.0.1 -catalogFeHost: fehost +#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 esHost: eshost disributionClientHost: disClient catalogFePort: 8181 @@ -12,7 +17,9 @@ 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 remoteTestingMachineIP: 0.0.0.0 remoteTestingMachinePort: 5566 remoteTesting: false diff --git a/ui-ci/src/main/resources/ci/scripts/copyToStorage.sh b/ui-ci/src/main/resources/ci/scripts/copyToStorage.sh index 396c1aa0ac..a113c54e60 100644 --- a/ui-ci/src/main/resources/ci/scripts/copyToStorage.sh +++ b/ui-ci/src/main/resources/ci/scripts/copyToStorage.sh @@ -3,7 +3,7 @@ REPORT_NAME=$1 VERSION=$2 ENV=$3 -IP=$3 + if [ -z "$REPORT_NAME" ] then @@ -20,6 +20,10 @@ if [ -z "$REPORT_NAME" ] fi +source conf/attInternal.info +IP=$automationResutlsRepo +PASS=$automationResutlsRepoPass + /usr/bin/expect << EOF spawn ssh admin@${IP} mkdir -p -m 775 /home/admin/reports/${ENV}/${VERSION}/UI/ @@ -29,13 +33,13 @@ expect { exp_continue } -re ".*sword.*" { - exp_send "Aa123456\r" + exp_send ${PASS}\r } } expect eof -spawn scp -pr ExtentReport admin@{IP}:/home/admin/reports/${ENV}/${VERSION}/UI/${REPORT_NAME}/ +spawn scp -pr ExtentReport admin@${IP}:/home/admin/reports/${ENV}/${VERSION}/UI/${REPORT_NAME}/ expect { -re ".*es.*o.*" { @@ -43,7 +47,7 @@ expect { exp_continue } -re ".*sword.*" { - exp_send "Aa123456\r" + exp_send ${PASS}\r } } diff --git a/ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml b/ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml index da2bc98ebc..36993e382c 100644 --- a/ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml +++ b/ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml @@ -9,6 +9,8 @@ <class name="org.openecomp.sdc.ci.tests.execute.sanity.Onboard"> <methods> <exclude name="onboardVNFTestSanity"/> + <exclude name="onboardVNFShotFlow"/> + <exclude name="onboardRandomVNFsTest"/> </methods> </class> <class name="org.openecomp.sdc.ci.tests.execute.sanity.CatalogLeftPanelTest"/> diff --git a/ui-ci/src/main/resources/ci/testSuites/onboardingVNFs.xml b/ui-ci/src/main/resources/ci/testSuites/onboardingVNFs.xml index a49c8a751c..c55da4274c 100644 --- a/ui-ci/src/main/resources/ci/testSuites/onboardingVNFs.xml +++ b/ui-ci/src/main/resources/ci/testSuites/onboardingVNFs.xml @@ -1,16 +1,20 @@ <?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="2" data-provider-thread-count="2"> -<parameter name="makeDistribution" value="true"/> - <test name="Onboarding"> + <parameter name="makeDistribution" value="true"/> + + <test name="uiSanity"> <classes> <class name="org.openecomp.sdc.ci.tests.execute.sanity.Onboard"> <methods> - <include name="onboardVNFTest"/> + <exclude name="onboardVNFTestSanity"/> + <exclude name="onboardVNFShotFlow"/> + <exclude name="onboardRandomVNFsTest"/> </methods> </class> + </classes> </test> <!-- uitests --> </suite> <!-- uisuite -->
\ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/testSuites/onboardingVNFsShortFlow.xml b/ui-ci/src/main/resources/ci/testSuites/onboardingVNFsShortFlow.xml new file mode 100644 index 0000000000..4a4628a9ed --- /dev/null +++ b/ui-ci/src/main/resources/ci/testSuites/onboardingVNFsShortFlow.xml @@ -0,0 +1,18 @@ +<?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="2" data-provider-thread-count="2"> + <parameter name="makeDistribution" value="true"/> + + <test name="uiSanity"> + <classes> + + <class name="org.openecomp.sdc.ci.tests.execute.sanity.Onboard"> + <methods> + <include name="onboardVNFShotFlow"/> + </methods> + </class> + + + </classes> + </test> <!-- uitests --> +</suite> <!-- uisuite -->
\ No newline at end of file |