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

OZG-6368: fix: further fixes

parent eb22a548
No related branches found
No related tags found
No related merge requests found
import groovy.json.JsonOutput import groovy.json.JsonOutput
import org.yaml.snakeyaml.Yaml
def SKIP_RUN = false def SKIP_RUN = false
...@@ -222,7 +221,7 @@ pipeline { ...@@ -222,7 +221,7 @@ pipeline {
FAILED_STAGE = env.STAGE_NAME FAILED_STAGE = env.STAGE_NAME
waitForAdminRollout(env.ADMIN_BEZEICHNER) waitForAdminRollout(env.ADMIN_BEZEICHNER)
waitForOzgCloudStackRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER]) waitForAlfaRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
} }
} }
post { post {
...@@ -625,14 +624,14 @@ Void waitForDeletion(String bezeichner) { ...@@ -625,14 +624,14 @@ Void waitForDeletion(String bezeichner) {
} }
} }
Void waitForOzgCloudStackRollout(ozgCloudBezeichner) { Void waitForAlfaRollout(ozgCloudBezeichner) {
for(bezeichner in ozgCloudBezeichner) { for(bezeichner in ozgCloudBezeichner) {
waitForAlfaRollout(bezeichner) waitForAlfaRollout(bezeichner)
} }
} }
Void waitForAdminRollout(String bezeichner) { Void waitForAdminRollout(String bezeichner) {
waitForOzgCloudStackRollout([bezeichner]) waitForAlfaRollout([bezeichner])
waitForHealthyApplication(bezeichner, 'administration') waitForHealthyApplication(bezeichner, 'administration')
waitForHealthyApplication(bezeichner, 'admin-client') waitForHealthyApplication(bezeichner, 'admin-client')
} }
......
...@@ -15,19 +15,22 @@ admin_client: ...@@ -15,19 +15,22 @@ admin_client:
ingress: ingress:
use_staging_cert: true use_staging_cert: true
# #
#alfa: alfa:
enabled: false
# env: # env:
# overrideSpringProfiles: "oc,e2e,dev" # overrideSpringProfiles: "oc,e2e,dev"
# ingress: # ingress:
# use_staging_cert: true # use_staging_cert: true
# #
#vorgang_manager: vorgang_manager:
enabled: false
# env: # env:
# overrideSpringProfiles: "oc,e2e,dev" # overrideSpringProfiles: "oc,e2e,dev"
# elasticsearch: # elasticsearch:
# enabled: true # enabled: true
# #
#user_manager: user_manager:
enabled: false
# ozgcloud: # ozgcloud:
# usersync: # usersync:
# onstart: false # onstart: false
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment