diff --git a/Jenkinsfile b/Jenkinsfile index 7e06398de5429b047a91d452566914eaad2e87e6..cdbc6fc0136923f13e341a9e30816ce08098638b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -141,76 +141,6 @@ pipeline { } } } - stage('E2E') { - failFast false - - parallel { - stage('E2E-EA') { - steps { - script { - def stageName = env.STAGE_NAME - def bezeichner = generateBezeichner(stageName) - def namespace = generateNamespaceName(bezeichner) - - startEnvironment(namespace, 'ea-values.yaml', 'ea-values.yaml', IMAGE_TAG, bezeichner) - - def testResult = runTests(stageName, 'einheitlicher-ansprechpartner') - - shutdownEnvironment(namespace) - - if(!testResult) { - E2E_FAILED += "${stageName}, " - error("Fehler in Stage ${stageName}") - } - } - } - post { - always { - script { - publishE2ETestResult("einheitlicher-ansprechpartner", "Goofy E2E-Tests EA") - } - } - } - } - stage('E2E-main') { - steps { - script { - def stageName = env.STAGE_NAME - def bezeichner = generateBezeichner(stageName) - def namespace = generateNamespaceName(bezeichner) - - startEnvironment(namespace, 'values.yaml', 'values.yaml', IMAGE_TAG, bezeichner) - - def testResult = runTests(stageName, 'main-tests') - - shutdownEnvironment(namespace) - - if(!testResult) { - E2E_FAILED += "${stageName}, " - error("Fehler in Stage ${stageName}") - } - } - } - post { - always { - script { - publishE2ETestResult("main-tests", "Goofy E2E-Tests main") - } - } - } - } - } - post { - always { - script { - if (E2E_FAILED) { - FAILED_STAGE = "E2E (${E2E_FAILED.substring(0, E2E_FAILED.length() - 2)})" - error("Fehler in E2E-Tests") - } - } - } - } - } stage('Deploy Maven Artifacts to Nexus') { when { anyOf { @@ -294,6 +224,76 @@ pipeline { } } } + stage('E2E') { + failFast false + + parallel { + stage('E2E-EA') { + steps { + script { + def stageName = env.STAGE_NAME + def bezeichner = generateBezeichner(stageName) + def namespace = generateNamespaceName(bezeichner) + + startEnvironment(namespace, 'ea-values.yaml', 'ea-values.yaml', IMAGE_TAG, bezeichner) + + def testResult = runTests(stageName, 'einheitlicher-ansprechpartner') + + shutdownEnvironment(namespace) + + if(!testResult) { + E2E_FAILED += "${stageName}, " + error("Fehler in Stage ${stageName}") + } + } + } + post { + always { + script { + publishE2ETestResult("einheitlicher-ansprechpartner", "Goofy E2E-Tests EA") + } + } + } + } + stage('E2E-main') { + steps { + script { + def stageName = env.STAGE_NAME + def bezeichner = generateBezeichner(stageName) + def namespace = generateNamespaceName(bezeichner) + + startEnvironment(namespace, 'values.yaml', 'values.yaml', IMAGE_TAG, bezeichner) + + def testResult = runTests(stageName, 'main-tests') + + shutdownEnvironment(namespace) + + if(!testResult) { + E2E_FAILED += "${stageName}, " + error("Fehler in Stage ${stageName}") + } + } + } + post { + always { + script { + publishE2ETestResult("main-tests", "Goofy E2E-Tests main") + } + } + } + } + } + post { + always { + script { + if (E2E_FAILED) { + FAILED_STAGE = "E2E (${E2E_FAILED.substring(0, E2E_FAILED.length() - 2)})" + error("Fehler in E2E-Tests") + } + } + } + } + } } post { failure {