Skip to content
Snippets Groups Projects
Commit acabc5ba authored by OZGCloud's avatar OZGCloud
Browse files

e2e new build agent, stage for elastic portforward

parent df3723bb
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ def SKIP_RUN = false ...@@ -5,7 +5,7 @@ def SKIP_RUN = false
pipeline { pipeline {
agent { agent {
node { node {
label 'jenkins-build-agent-nodejs-18' label 'ozgcloud-jenkins-build-agent'
} }
} }
...@@ -161,7 +161,7 @@ pipeline { ...@@ -161,7 +161,7 @@ pipeline {
} }
} }
stage('Rollout E2E Main') { stage('Rollout E2E Namespaces') {
when { when {
expression { !SKIP_RUN } expression { !SKIP_RUN }
} }
...@@ -171,25 +171,25 @@ pipeline { ...@@ -171,25 +171,25 @@ pipeline {
checkoutGitopsE2eBranch() checkoutGitopsE2eBranch()
deleteKopStack([env.MAIN_BEZEICHNER]) deleteKopStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
generateMainNamespaceYaml() generateMainNamespaceYaml()
pushGitopsRepo() pushGitopsRepo()
waitForKopStackRollout([env.MAIN_BEZEICHNER]) waitForKopStackRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
} }
} }
post { /*post {
failure { failure {
script { script {
deleteKopStack([env.MAIN_BEZEICHNER]) deleteKopStack([env.MAIN_BEZEICHNER])
} }
} }
} }*/
} }
stage('Rollout E2E EA') { stage('Init PortForwards') {
when { when {
expression { !SKIP_RUN } expression { !SKIP_RUN }
} }
...@@ -197,22 +197,7 @@ pipeline { ...@@ -197,22 +197,7 @@ pipeline {
script { script {
FAILED_STAGE = env.STAGE_NAME FAILED_STAGE = env.STAGE_NAME
checkoutGitopsE2eBranch() forwardElasticSearch()
deleteKopStack([env.EA_BEZEICHNER])
generateEaNamespaceYaml()
pushGitopsRepo()
waitForKopStackRollout([env.EA_BEZEICHNER])
}
}
post {
failure {
script {
deleteKopStack([env.EA_BEZEICHNER])
}
} }
} }
} }
...@@ -279,7 +264,7 @@ pipeline { ...@@ -279,7 +264,7 @@ pipeline {
} }
} }
} }
/*
stage('Delete E2E Namespaces') { stage('Delete E2E Namespaces') {
when { when {
expression { !SKIP_RUN } expression { !SKIP_RUN }
...@@ -292,6 +277,7 @@ pipeline { ...@@ -292,6 +277,7 @@ pipeline {
} }
} }
} }
*/
} }
post { post {
failure { failure {
...@@ -814,7 +800,6 @@ Map getElasticsearchEnv(String namespace) { ...@@ -814,7 +800,6 @@ Map getElasticsearchEnv(String namespace) {
Void forwardServices(String namespace, Integer dbPort) { Void forwardServices(String namespace, Integer dbPort) {
try { try {
forwardDatenbank(namespace, dbPort) forwardDatenbank(namespace, dbPort)
forwardElasticSearch()
} }
catch (Exception e) { catch (Exception e) {
echo "forwardServices Exception: ${e}" echo "forwardServices Exception: ${e}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment