Merge pull request 'e2e update jenkinsfile rollout fix' (#340) from...

Merge pull request 'e2e update jenkinsfile rollout fix' (#340) from e2e-update-jenkinsfile into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/alfa/pulls/340


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

alfa-client/apps/alfa-e2e/Jenkinsfile

@@ -171,25 +171,26 @@ pipeline {
 
                     checkoutGitopsE2eBranch()
 
-                    deleteOzgCloudStack([env.MAIN_BEZEICHNER])
+                    deleteOzgCloudStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
 
                     generateMainNamespaceYaml()
+                    generateEaNamespaceYaml()
 
                     pushGitopsRepo()
 
-                    waitForOzgCloudStackRollout([env.MAIN_BEZEICHNER])
+                    waitForOzgCloudStackRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
                 }
             }
             post {
                 failure {
                     script {
-                        deleteOzgCloudStack([env.MAIN_BEZEICHNER])
+                        deleteOzgCloudStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
                     }
                 }
             }
         }
 
-        stage('Rollout E2E EA') {
+        stage('Init PortForwards') {
             when {
                 expression { !SKIP_RUN }
             }
@@ -197,22 +198,7 @@ pipeline {
                 script {
                     FAILED_STAGE = env.STAGE_NAME
 
-					checkoutGitopsE2eBranch()
-
-					deleteOzgCloudStack([env.EA_BEZEICHNER])
-
-					generateEaNamespaceYaml()
-
-					pushGitopsRepo()
-
-					waitForOzgCloudStackRollout([env.EA_BEZEICHNER])
-				}
-			}
-			post {
-				failure {
-					script {
-						deleteOzgCloudStack([env.EA_BEZEICHNER])
-					}
+                    forwardElasticSearch()
                 }
             }
         }