Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frontend-clients
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OZG-Cloud
app
frontend-clients
Commits
97b687d4
Commit
97b687d4
authored
4 weeks ago
by
Albert Bruns
Browse files
Options
Downloads
Patches
Plain Diff
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
!123
OZG-7773-Nachrichten-auf-ungelesen-setzen-e2e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
alfa-client/Jenkinsfile.e2e
+2
-93
2 additions, 93 deletions
alfa-client/Jenkinsfile.e2e
alfa-client/apps/run-tests.sh
+1
-1
1 addition, 1 deletion
alfa-client/apps/run-tests.sh
with
3 additions
and
94 deletions
alfa-client/Jenkinsfile.e2e
+
2
−
93
View file @
97b687d4
...
...
@@ -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'"
}
...
...
This diff is collapsed.
Click to expand it.
alfa-client/apps/run-tests.sh
+
1
−
1
View file @
97b687d4
...
...
@@ -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
}
...
...
This diff is collapsed.
Click to expand it.
Albert Bruns
@abruns
mentioned in commit
c2dbe847
·
4 weeks ago
mentioned in commit
c2dbe847
mentioned in commit c2dbe847deee72e6c9b7d42852d550c5d5358299
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment