diff --git a/alfa-client/Jenkinsfile.e2e b/alfa-client/Jenkinsfile.e2e index d6a27c025e4455a12856d77f5810f7d6e83d7930..772abf065663e2bc567809613900c0b7df422437 100644 --- a/alfa-client/Jenkinsfile.e2e +++ b/alfa-client/Jenkinsfile.e2e @@ -1,5 +1,4 @@ import groovy.json.JsonOutput -import org.yaml.snakeyaml.Yaml def SKIP_RUN = false @@ -222,7 +221,7 @@ pipeline { FAILED_STAGE = env.STAGE_NAME waitForAdminRollout(env.ADMIN_BEZEICHNER) - waitForOzgCloudStackRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER]) + waitForAlfaRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER]) } } post { @@ -625,14 +624,14 @@ Void waitForDeletion(String bezeichner) { } } -Void waitForOzgCloudStackRollout(ozgCloudBezeichner) { +Void waitForAlfaRollout(ozgCloudBezeichner) { for(bezeichner in ozgCloudBezeichner) { waitForAlfaRollout(bezeichner) } } Void waitForAdminRollout(String bezeichner) { - waitForOzgCloudStackRollout([bezeichner]) + waitForAlfaRollout([bezeichner]) waitForHealthyApplication(bezeichner, 'administration') waitForHealthyApplication(bezeichner, 'admin-client') } diff --git a/alfa-client/apps/admin-e2e/src/fixtures/argocd/by-admin-dev.yaml b/alfa-client/apps/admin-e2e/src/fixtures/argocd/by-admin-dev.yaml index fe6b2471114cc4e187d0d2249a59896650c4a4ca..43680939b7398d5544573fb86a0ff07c6092f319 100644 --- a/alfa-client/apps/admin-e2e/src/fixtures/argocd/by-admin-dev.yaml +++ b/alfa-client/apps/admin-e2e/src/fixtures/argocd/by-admin-dev.yaml @@ -15,19 +15,22 @@ admin_client: ingress: use_staging_cert: true # -#alfa: +alfa: + enabled: false # env: # overrideSpringProfiles: "oc,e2e,dev" # ingress: # use_staging_cert: true # -#vorgang_manager: +vorgang_manager: + enabled: false # env: # overrideSpringProfiles: "oc,e2e,dev" # elasticsearch: # enabled: true # -#user_manager: +user_manager: + enabled: false # ozgcloud: # usersync: # onstart: false