Merge pull request 'e2e new build agent, stage for elastic portforward' (#338)...

Merge pull request 'e2e new build agent, stage for elastic portforward' (#338) from e2e-torsten-tests-2 into master

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

goofy-client/apps/alfa-e2e/Jenkinsfile

@@ -5,7 +5,7 @@ def SKIP_RUN = false
 pipeline {
     agent {
         node {
-            label 'jenkins-build-agent-nodejs-18'
+            label 'ozgcloud-jenkins-build-agent'
         }
     }
 
@@ -161,7 +161,7 @@ pipeline {
             }
         }
 
-        stage('Rollout E2E Main') {
+        stage('Rollout E2E Namespaces') {
             when {
                 expression { !SKIP_RUN }
             }
@@ -171,13 +171,13 @@ pipeline {
 
                     checkoutGitopsE2eBranch()
 
-                    deleteKopStack([env.MAIN_BEZEICHNER])
+                    deleteKopStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
 
                     generateMainNamespaceYaml()
 
                     pushGitopsRepo()
 
-                    waitForKopStackRollout([env.MAIN_BEZEICHNER])
+                    waitForKopStackRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
                 }
             }
             post {
@@ -189,7 +189,7 @@ pipeline {
             }
         }
 
-        stage('Rollout E2E EA') {
+        stage('Init PortForwards') {
             when {
                 expression { !SKIP_RUN }
             }
@@ -197,22 +197,7 @@ pipeline {
                 script {
                     FAILED_STAGE = env.STAGE_NAME
 
-                    checkoutGitopsE2eBranch()
-
-                    deleteKopStack([env.EA_BEZEICHNER])
-
-                    generateEaNamespaceYaml()
-
-                    pushGitopsRepo()
-
-                    waitForKopStackRollout([env.EA_BEZEICHNER])
-                }
-            }
-            post {
-                failure {
-                    script {
-                        deleteKopStack([env.EA_BEZEICHNER])
-                    }
+                    forwardElasticSearch()
                 }
             }
         }
@@ -292,6 +277,7 @@ pipeline {
                 }
             }
         }
+
     }
     post {
         failure {
@@ -814,7 +800,6 @@ Map getElasticsearchEnv(String namespace) {
 Void forwardServices(String namespace, Integer dbPort) {
     try {
         forwardDatenbank(namespace, dbPort)
-        forwardElasticSearch()
     }
     catch (Exception e) {
         echo "forwardServices Exception: ${e}"