From 902f84d60ff055ad431098b8c7b855cea4d39be5 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 23 Oct 2024 16:24:42 +0200
Subject: [PATCH] OZG-6368: fix: further fixes
---
alfa-client/Jenkinsfile.e2e | 7 +++----
.../apps/admin-e2e/src/fixtures/argocd/by-admin-dev.yaml | 9 ++++++---
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/alfa-client/Jenkinsfile.e2e b/alfa-client/Jenkinsfile.e2e
index d6a27c025e..772abf0656 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 fe6b247111..43680939b7 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
--
GitLab