diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile index 5e97e0480eab28eef479fdc1167087c71fc712c1..da8ee00881597712ec23b64e879c2ec26c2046d7 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) {