diff --git a/alfa-client/Jenkinsfile.e2e b/alfa-client/Jenkinsfile.e2e
index 49aee16f142e42e63020ab4ac52d2ff6fe09597b..306c445fb5ad9a0657796d2abef410894de86a2e 100644
--- a/alfa-client/Jenkinsfile.e2e
+++ b/alfa-client/Jenkinsfile.e2e
@@ -12,7 +12,7 @@ pipeline {
triggers {
// upstream(upstreamProjects: getUpstreamProjects(), threshold: hudson.model.Result.SUCCESS)
- cron('0 18-23,0-5 * * *')
+ //cron('0 18-23,0-5 * * *')
}
environment {
@@ -176,12 +176,9 @@ pipeline {
checkoutGitopsE2eBranch()
- deleteOzgCloudStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER, env.ADMIN_BEZEICHNER])
+ deleteNamespaces([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER, env.ADMIN_BEZEICHNER])
- generateAllNamespaces()
-// generateMainNamespaceYaml()
-// generateEaNamespaceYaml()
-// generateAdminNamespaceYaml()
+ generateNamespaces()
pushGitopsRepo()
}
@@ -189,7 +186,7 @@ pipeline {
post {
failure {
script {
- deleteOzgCloudStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER, env.ADMIN_BEZEICHNER])
+ deleteNamespaces([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER, env.ADMIN_BEZEICHNER])
}
}
}
@@ -225,13 +222,13 @@ pipeline {
FAILED_STAGE = env.STAGE_NAME
waitForAdminRollout(env.ADMIN_BEZEICHNER)
- waitForOzgCloudStackRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
+// waitForOzgCloudStackRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
}
}
post {
failure {
script {
- deleteOzgCloudStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER, env.ADMIN_BEZEICHNER])
+ deleteNamespaces([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER, env.ADMIN_BEZEICHNER])
}
}
}
@@ -257,67 +254,67 @@ pipeline {
// failFast false
// parallel {
- stage('E2E-Alfa-EA') {
- when {
- expression { !SKIP_RUN }
- }
- steps {
- catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
- script {
- def bezeichner = env.EA_BEZEICHNER
-
- Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner))
-
- runTests(bezeichner, 'alfa-e2e', 'einheitlicher-ansprechpartner', env.KEYCLOAK_CLIENT_ALFA_APP, mongoDbPort, env.STAGE_NAME)
-
- stopForwardMongoDbPort(generateNamespace(bezeichner))
- }
- }
- }
- post {
- failure {
- script {
- FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} "
- }
- }
- always {
- script {
- publishAlfaE2ETestResult("einheitlicher-ansprechpartner", "Alfa E2E-Tests EA")
- }
- }
- }
- }
-
- stage('E2E-Alfa-Main') {
- when {
- expression { !SKIP_RUN }
- }
- steps {
- catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
- script {
- def bezeichner = env.MAIN_BEZEICHNER
-
- Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner))
-
- runTests(bezeichner, 'alfa-e2e', 'main-tests', env.KEYCLOAK_CLIENT_ALFA_APP, mongoDbPort, env.STAGE_NAME)
-
- stopForwardMongoDbPort(generateNamespace(bezeichner))
- }
- }
- }
- post {
- failure {
- script {
- FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} "
- }
- }
- always {
- script {
- publishAlfaE2ETestResult("main-tests", "Alfa E2E-Tests main")
- }
- }
- }
- }
+// stage('E2E-Alfa-EA') {
+// when {
+// expression { !SKIP_RUN }
+// }
+// steps {
+// catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+// script {
+// def bezeichner = env.EA_BEZEICHNER
+//
+// Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner))
+//
+// runTests(bezeichner, 'alfa-e2e', 'einheitlicher-ansprechpartner', env.KEYCLOAK_CLIENT_ALFA_APP, mongoDbPort, env.STAGE_NAME)
+//
+// stopForwardMongoDbPort(generateNamespace(bezeichner))
+// }
+// }
+// }
+// post {
+// failure {
+// script {
+// FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} "
+// }
+// }
+// always {
+// script {
+// publishAlfaE2ETestResult("einheitlicher-ansprechpartner", "Alfa E2E-Tests EA")
+// }
+// }
+// }
+// }
+//
+// stage('E2E-Alfa-Main') {
+// when {
+// expression { !SKIP_RUN }
+// }
+// steps {
+// catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+// script {
+// def bezeichner = env.MAIN_BEZEICHNER
+//
+// Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner))
+//
+// runTests(bezeichner, 'alfa-e2e', 'main-tests', env.KEYCLOAK_CLIENT_ALFA_APP, mongoDbPort, env.STAGE_NAME)
+//
+// stopForwardMongoDbPort(generateNamespace(bezeichner))
+// }
+// }
+// }
+// post {
+// failure {
+// script {
+// FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} "
+// }
+// }
+// always {
+// script {
+// publishAlfaE2ETestResult("main-tests", "Alfa E2E-Tests main")
+// }
+// }
+// }
+// }
stage('E2E-Admin-Main') {
when {
expression { !SKIP_RUN }
@@ -359,7 +356,7 @@ pipeline {
script {
FAILED_STAGE = env.STAGE_NAME
- deleteOzgCloudStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER, env.ADMIN_BEZEICHNER])
+ deleteNamespaces([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER, env.ADMIN_BEZEICHNER])
}
}
}
@@ -530,13 +527,14 @@ Void checkoutGitopsE2eBranch() {
}
}
-Void generateAllNamespaces() {
+Void generateNamespaces() {
def y1 = generateAdminNamespaceYaml()
- def y2 = generateEaNamespaceYaml()
- def y3 = generateMainNamespaceYaml()
+// def y2 = generateEaNamespaceYaml()
+// def y3 = generateMainNamespaceYaml()
dir("gitops") {
- sh "git add ${y1} ${y2} ${y3}"
+// sh "git add ${y1} ${y2} ${y3}"
+ sh "git add ${y1}"
sh "git commit -m 'add e2e namespaces for testrun'"
}
@@ -594,7 +592,7 @@ String writeYamlToGitOps(String bezeichner, Object envValues){
return bezeichnerYaml;
}
-Void deleteOzgCloudStack(ozgCloudBezeichner) {
+Void deleteNamespaces(ozgCloudBezeichner) {
for(bezeichner in ozgCloudBezeichner) {
if (hasNamespaceFile(bezeichner)) {
removeNamespaceFile(bezeichner)
@@ -701,9 +699,6 @@ Void publishE2ETestResult(String appName, String appVariant, String reportName)
)
}
-// runTests(env.EA_BEZEICHNER, 'alfa-e2e', 'einheitlicher-ansprechpartner', env.KEYCLOAK_CLIENT_ALFA_APP, mongoDbPort, env.STAGE_NAME
-// runTests(env.EA_BEZEICHNER, 'alfa-e2e', 'main-tests', env.KEYCLOAK_CLIENT_ALFA_APP, mongoDbPort, env.STAGE_NAME
-// runTests(env.EA_BEZEICHNER, 'admin-e2e', 'main-tests', env.KEYCLOAK_CLIENT_ADMIN_APP, mongoDbPort, env.STAGE_NAME
String runTests(String bezeichner, String appName, String appVariant, String keycloakClientName, Integer dbPort, String stageName) {
def config = generateCypressConfig(bezeichner, appName, appVariant, keycloakClientName, dbPort)
try {
diff --git a/alfa-client/apps/admin-e2e/cypress-ci.json b/alfa-client/apps/admin-e2e/cypress-ci.json
index b7768dbc3af38c4282d24c58f396f65d2ca20f3b..ca9f95c11d0896e1559b198fe1521e9f5c95b423 100644
--- a/alfa-client/apps/admin-e2e/cypress-ci.json
+++ b/alfa-client/apps/admin-e2e/cypress-ci.json
@@ -1,7 +1,7 @@
{
"env": {
"database": "vorgang-manager-database",
- "keycloakClient": "alfa"
+ "keycloakClient": "admin"
},
"fileServerFolder": ".",
"fixturesFolder": "./src/fixtures",
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 d8edc3059028f35038c433d1f57bfe2c48cb4850..fe6b2471114cc4e187d0d2249a59896650c4a4ca 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
@@ -14,26 +14,26 @@ admin_client:
enabled: true
ingress:
use_staging_cert: true
-
-alfa:
- env:
- overrideSpringProfiles: "oc,e2e,dev"
- ingress:
- use_staging_cert: true
-
-vorgang_manager:
- env:
- overrideSpringProfiles: "oc,e2e,dev"
- elasticsearch:
- enabled: true
-
-user_manager:
- ozgcloud:
- usersync:
- onstart: false
- period: disabled
- ingress:
- use_staging_cert: true
+#
+#alfa:
+# env:
+# overrideSpringProfiles: "oc,e2e,dev"
+# ingress:
+# use_staging_cert: true
+#
+#vorgang_manager:
+# env:
+# overrideSpringProfiles: "oc,e2e,dev"
+# elasticsearch:
+# enabled: true
+#
+#user_manager:
+# ozgcloud:
+# usersync:
+# onstart: false
+# period: disabled
+# ingress:
+# use_staging_cert: true
smocker:
enabled: false
\ No newline at end of file