Skip to content
Snippets Groups Projects
Commit 97b687d4 authored by Albert Bruns's avatar Albert Bruns
Browse files

OZG-3563 run only one test on e2e and not delete namespace

parent 8807b08e
No related branches found
No related tags found
1 merge request!123OZG-7773-Nachrichten-auf-ungelesen-setzen-e2e
......@@ -205,20 +205,11 @@ pipeline {
checkoutGitopsE2eBranch()
deleteNamespaces([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER, env.ADMIN_BEZEICHNER])
generateNamespaces()
pushGitopsRepo()
}
}
post {
failure {
script {
deleteNamespaces([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER, env.ADMIN_BEZEICHNER])
}
}
}
}
stage("Install Cypress") {
......@@ -248,15 +239,7 @@ pipeline {
script {
FAILED_STAGE = env.STAGE_NAME
waitForAdminRollout(env.ADMIN_BEZEICHNER)
waitForAlfaRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
}
}
post {
failure {
script {
deleteNamespaces([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER, env.ADMIN_BEZEICHNER])
}
waitForAlfaRollout([env.MAIN_BEZEICHNER])
}
}
}
......@@ -281,36 +264,7 @@ 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 {
......@@ -342,52 +296,9 @@ pipeline {
}
}
}
stage('E2E-Admin-Main') {
when {
expression { !SKIP_RUN }
}
steps {
catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
script {
String bezeichner = env.ADMIN_BEZEICHNER
Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner))
runTests(bezeichner, 'admin-e2e', 'main-tests', env.KEYCLOAK_CLIENT_ADMIN_APP, mongoDbPort, env.STAGE_NAME)
stopForwardMongoDbPort(generateNamespace(bezeichner))
}
}
}
post {
failure {
script {
FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} "
}
}
always {
script {
publishAdminE2ETestResult()
}
}
}
}
// }
//}
stage('Delete E2E Namespaces') {
when {
expression { !SKIP_RUN }
}
steps {
script {
FAILED_STAGE = env.STAGE_NAME
deleteNamespaces([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER, env.ADMIN_BEZEICHNER])
}
}
}
}
post {
failure {
......@@ -543,12 +454,10 @@ Void checkoutGitopsE2eBranch() {
}
Void generateNamespaces() {
def y1 = generateAdminNamespaceYaml()
def y2 = generateEaNamespaceYaml()
def y3 = generateMainNamespaceYaml()
dir("gitops") {
sh "git add ${y1} ${y2} ${y3}"
sh "git add ${y3}"
sh "git commit -m 'add e2e namespaces for testrun'"
}
......
......@@ -40,7 +40,7 @@ if [ -z $CONFIG_FILE ]; then echo "Config File not set" && exit 1; fi
SCRIPT_DIR="$(dirname "$0")"
BASE_PATH=${SCRIPT_DIR}/${APP_NAME}
SPEC_GROUP=${BASE_PATH}/src/e2e/${APP_VARIATION}
SPEC_GROUP=${BASE_PATH}/src/e2e/main-tests/vorgang-bescheid/vorgang-bescheid-dokumente-hochladen.cy.ts
COMMAND="pnpm exec cypress run --project ${BASE_PATH} --spec ${SPEC_GROUP} --config-file ${CONFIG_FILE}"
REPORT_PATH=${BASE_PATH}/reports/${APP_VARIATION}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment