diff --git a/goofy-client/apps/goofy-e2e/Jenkinsfile b/goofy-client/apps/goofy-e2e/Jenkinsfile index dc4e557bf1417d558a667d6d50d6905fa984e375..e6fec69134542c2738377557453158ee1d71e218 100644 --- a/goofy-client/apps/goofy-e2e/Jenkinsfile +++ b/goofy-client/apps/goofy-e2e/Jenkinsfile @@ -199,67 +199,64 @@ pipeline { // } // } - stage('Run E2E-Tests') { + stage('Run E2E-EA Tests') { when { expression { !SKIP_RUN } } - failFast false - - parallel { - stage('E2E-EA') { - steps { - catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { - script { - def bezeichner = env.EA_BEZEICHNER - def dbPort = 27018 - - forwardServices(generateNamespace(bezeichner), dbPort) - - runTests(bezeichner, 'einheitlicher-ansprechpartner', dbPort, env.STAGE_NAME) - } - } - } - post { - failure { - script { - FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} " - } - } - always { - script { - publishE2ETestResult("einheitlicher-ansprechpartner", "Goofy E2E-Tests EA") - } - } - } - } - - stage('E2E-Main') { - steps { - catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { - script { - def bezeichner = env.MAIN_BEZEICHNER - def dbPort = 27019 - - forwardServices(generateNamespace(bezeichner), dbPort) + steps { + catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { + script { + def bezeichner = env.EA_BEZEICHNER + def dbPort = 27018 + + forwardServices(generateNamespace(bezeichner), dbPort) + + runTests(bezeichner, 'einheitlicher-ansprechpartner', dbPort, env.STAGE_NAME) + } + } + } + post { + failure { + script { + FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} " + } + } + always { + script { + publishE2ETestResult("einheitlicher-ansprechpartner", "Goofy E2E-Tests EA") + } + } + } + } - runTests(bezeichner, 'main-tests', dbPort, env.STAGE_NAME) - } - } - } - post { - failure { - script { - FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} " - } - } - always { - script { - publishE2ETestResult("main-tests", "Goofy E2E-Tests main") - } - } - } - } + stage('Run E2E-Main Tests') { + when { + expression { !SKIP_RUN } } + steps { + catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { + script { + def bezeichner = env.MAIN_BEZEICHNER + def dbPort = 27019 + + forwardServices(generateNamespace(bezeichner), dbPort) + + runTests(bezeichner, 'main-tests', dbPort, env.STAGE_NAME) + } + } + } + post { + failure { + script { + FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} " + } + } + always { + script { + publishE2ETestResult("main-tests", "Goofy E2E-Tests main") + } + } + } } stage('Delete E2E Namespaces') {