From 8cda702e958381eca1c016e6359bcec641b02d63 Mon Sep 17 00:00:00 2001 From: Eylon Malin Date: Mon, 6 Jan 2020 11:31:20 +0200 Subject: cypress test - split cypress test to 3 groups Issue-ID: VID-740 Change-Id: I772e26cc71339027d8a273acbb256ea1a8d81a11 Signed-off-by: Eylon Malin --- vid-webpack-master/cypress/pipeline/group1.txt | 11 ++++------- vid-webpack-master/cypress/pipeline/group2.txt | 19 +++++++++++++++++++ vid-webpack-master/cypress/pipeline/run_group2.sh | 6 +----- .../cypress/pipeline/run_groupRemain.sh | 17 +++++++++++++++++ 4 files changed, 41 insertions(+), 12 deletions(-) create mode 100644 vid-webpack-master/cypress/pipeline/group2.txt create mode 100644 vid-webpack-master/cypress/pipeline/run_groupRemain.sh (limited to 'vid-webpack-master') diff --git a/vid-webpack-master/cypress/pipeline/group1.txt b/vid-webpack-master/cypress/pipeline/group1.txt index 217efa122..0b3425060 100644 --- a/vid-webpack-master/cypress/pipeline/group1.txt +++ b/vid-webpack-master/cypress/pipeline/group1.txt @@ -1,11 +1,8 @@ +cypress/integration/iFrames/ala-carte.e2e.ts cypress/integration/iFrames/auditInfo.modal.e2e.ts cypress/integration/iFrames/browse-sdc.e2e.ts +cypress/integration/iFrames/changeManagement.e2e.ts cypress/integration/iFrames/collectionResource.e2e.ts +cypress/integration/iFrames/commitDialog.e2e.ts cypress/integration/iFrames/drawingBoard.e2e.ts -cypress/integration/iFrames/instantiationStatus.e2e.ts -cypress/integration/iFrames/network.popup.e2e.ts -cypress/integration/iFrames/permission.e2e.ts -cypress/integration/iFrames/pnf.e2e.ts -cypress/integration/iFrames/resume.e2e.ts -cypress/integration/iFrames/retry.e2e.ts -cypress/integration/iFrames/viewEdit.e2e.ts +cypress/integration/iFrames/instantiation-templates.e2e.ts diff --git a/vid-webpack-master/cypress/pipeline/group2.txt b/vid-webpack-master/cypress/pipeline/group2.txt new file mode 100644 index 000000000..7d808dd8a --- /dev/null +++ b/vid-webpack-master/cypress/pipeline/group2.txt @@ -0,0 +1,19 @@ +cypress/integration/iFrames/network.popup.e2e.ts +cypress/integration/iFrames/permission.e2e.ts +cypress/integration/iFrames/pnf.e2e.ts +cypress/integration/iFrames/retry.e2e.ts +cypress/integration/iFrames/searchExistingInstance.e2e.ts +cypress/integration/iFrames/service.popup.e2e.ts +cypress/integration/iFrames/serviceWithNetwork.e2e.ts +cypress/integration/iFrames/serviceWithVnfNetwork.e2e.ts +cypress/integration/iFrames/softDeleteAndResume.e2e.ts +cypress/integration/iFrames/tenantIsolation.e2e.ts +cypress/integration/iFrames/viewEdit.e2e.ts +cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts +cypress/integration/iFrames/viewOnlyDrawingBoard.e2e.ts +cypress/integration/iFrames/vnf.popup.e2e.ts +cypress/integration/iFrames/vnfGroups.e2e.ts +cypress/integration/iFrames/vrf.e2e.ts +cypress/integration/iFrames/welcomePage.e2e.ts +cypress/integration/shared/error.message.popup.e2e.ts +cypress/integration/shared/spinner.e2e.ts diff --git a/vid-webpack-master/cypress/pipeline/run_group2.sh b/vid-webpack-master/cypress/pipeline/run_group2.sh index 43cfbc63f..edee7efac 100644 --- a/vid-webpack-master/cypress/pipeline/run_group2.sh +++ b/vid-webpack-master/cypress/pipeline/run_group2.sh @@ -5,13 +5,9 @@ set -x CYPRESS_HOME_DIR=$1 -TESTS_GROUP_FILE_1=cypress/pipeline/group1.txt -TESTS_GROUP_FILE=cypress/pipeline/group2.generated.txt +TESTS_GROUP_FILE=cypress/pipeline/group2.txt cd ${CYPRESS_HOME_DIR} -# make group2 by "negating" group1.txt -ls -1 cypress/integration/*/*.e2e.ts | comm -3 - ${TESTS_GROUP_FILE_1} > ${TESTS_GROUP_FILE} - cat ${TESTS_GROUP_FILE} npm run cypress:headless --max-old-space-size=4096 -- --spec=$(cat ${TESTS_GROUP_FILE} | tr '\n' ',') diff --git a/vid-webpack-master/cypress/pipeline/run_groupRemain.sh b/vid-webpack-master/cypress/pipeline/run_groupRemain.sh new file mode 100644 index 000000000..51c30411d --- /dev/null +++ b/vid-webpack-master/cypress/pipeline/run_groupRemain.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +. $HOME/.nvm/nvm.sh + +set -x + +CYPRESS_HOME_DIR=$1 +REMAIN_TESTS_FILE=cypress/pipeline/remain.generated.txt +ALL_TESTS_IN_GROUPS_FILE=cypress/pipeline/all_tests.txt + +cd ${CYPRESS_HOME_DIR} +cat cypress/pipeline/group?.txt | sort > ${ALL_TESTS_IN_GROUPS_FILE} +# make group2 by "negating" group1.txt +ls -1 cypress/integration/*/*.e2e.ts | comm -3 - ${ALL_TESTS_IN_GROUPS_FILE} > ${REMAIN_TESTS_FILE} + +cat ${REMAIN_TESTS_FILE} +npm run cypress:headless --max-old-space-size=4096 -- --spec=$(cat ${REMAIN_TESTS_FILE} | tr '\n' ',') -- cgit 1.2.3-korg