From e76a0c22c2694a4b31c7291bd8e0fe428c02f55e Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 8 Aug 2023 19:29:11 +0200
Subject: [PATCH] OZG-3961 enable E2E Main Tests
---
goofy-client/apps/goofy-e2e/Jenkinsfile | 60 ++++++++++++-------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/goofy-client/apps/goofy-e2e/Jenkinsfile b/goofy-client/apps/goofy-e2e/Jenkinsfile
index b6a53c6555..52c8693816 100644
--- a/goofy-client/apps/goofy-e2e/Jenkinsfile
+++ b/goofy-client/apps/goofy-e2e/Jenkinsfile
@@ -171,20 +171,20 @@ pipeline {
checkoutGitopsE2eBranch()
- deleteKopStack([env.EA_BEZEICHNER]);//, env.MAIN_BEZEICHNER])
+ deleteKopStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
generateEaNamespaceYaml()
- //generateMainNamespaceYaml()
+ generateMainNamespaceYaml()
pushGitopsRepo()
- waitForKopStackRollout([env.EA_BEZEICHNER]);//, env.MAIN_BEZEICHNER])
+ waitForKopStackRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
}
}
post {
failure {
script {
- deleteKopStack([env.EA_BEZEICHNER]);//, env.MAIN_BEZEICHNER])
+ deleteKopStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
}
}
}
@@ -233,32 +233,32 @@ pipeline {
}
}
-// stage('E2E-Main') {
-// 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('E2E-Main') {
+ 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")
+ }
+ }
+ }
+ }
}
}
--
GitLab