From c61f92216dacb1a54afa89f37b396933fe8a34c3 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 14 Aug 2024 13:50:12 +0200
Subject: [PATCH] test e2e on load cluster
---
alfa-client/apps/alfa-e2e/Jenkinsfile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile
index 5e97e0480e..da8ee00881 100644
--- a/alfa-client/apps/alfa-e2e/Jenkinsfile
+++ b/alfa-client/apps/alfa-e2e/Jenkinsfile
@@ -530,9 +530,9 @@ Boolean hasNamespaceFile(String bezeichner) {
Void waitForDeletion(String bezeichner) {
try {
- sh "kubectl wait --for=delete applications/by-${bezeichner}-dev-application -n argocd --timeout=900s"
+ sh "kubectl wait --for=delete applications/by-${bezeichner}-load-application -n argocd --timeout=900s"
} catch (Exception e) {
- error("Application by-${bezeichner}-dev-application konnte nicht gelöscht werden")
+ error("Application by-${bezeichner}-load-application konnte nicht gelöscht werden")
}
}
@@ -569,15 +569,15 @@ Void waitForHealthyApplication(String bezeichner, String application) {
}
Boolean isApplicationPresent(String bezeichner, String application) {
- return sh (script: "kubectl get applications -n argocd | grep 'by-${bezeichner}-dev-${application}'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
+ return sh (script: "kubectl get applications -n argocd | grep 'by-${bezeichner}-load-${application}'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
}
Boolean isApplicationHealthy(String bezeichner, String application) {
- return sh (script: "kubectl get application/by-${bezeichner}-dev-${application} -n argocd -o=jsonpath='{.status.health.status}' | grep Healthy", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
+ return sh (script: "kubectl get application/by-${bezeichner}-load-${application} -n argocd -o=jsonpath='{.status.health.status}' | grep Healthy", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
}
Void waitForHealthyStatus(String bezeichner, String application) {
- sh "kubectl wait --for=jsonpath='{.status.health.status}'=Healthy applications/by-${bezeichner}-dev-${application} -n argocd --timeout=900s"
+ sh "kubectl wait --for=jsonpath='{.status.health.status}'=Healthy applications/by-${bezeichner}-load-${application} -n argocd --timeout=900s"
}
Void publishE2ETestResult(String reportFolder, String reportName) {
@@ -789,7 +789,7 @@ Boolean isElasticSearchForwarded() {
}
String generateNamespace(String bezeichner) {
- return "${env.BUNDESLAND}-${bezeichner}-dev"
+ return "${env.BUNDESLAND}-${bezeichner}-load"
}
String decodeString(String encoded) {
--
GitLab