Skip to content
Snippets Groups Projects
Commit 3011ea76 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6368: Only deploy admin namespace and try to evaluate, if alfa+vm+um are necessary

parent f6111820
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
alfa-client/Jenkinsfile.e2e
+ 74
− 79
View file @ 3011ea76
...@@ -12,7 +12,7 @@ pipeline { ...@@ -12,7 +12,7 @@ pipeline {
triggers { triggers {
// upstream(upstreamProjects: getUpstreamProjects(), threshold: hudson.model.Result.SUCCESS) // upstream(upstreamProjects: getUpstreamProjects(), threshold: hudson.model.Result.SUCCESS)
cron('0 18-23,0-5 * * *') //cron('0 18-23,0-5 * * *')
} }
environment { environment {
...@@ -176,12 +176,9 @@ pipeline { ...@@ -176,12 +176,9 @@ pipeline {
checkoutGitopsE2eBranch() checkoutGitopsE2eBranch()
deleteOzgCloudStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER, env.ADMIN_BEZEICHNER]) deleteNamespaces([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER, env.ADMIN_BEZEICHNER])
generateAllNamespaces() generateNamespaces()
// generateMainNamespaceYaml()
// generateEaNamespaceYaml()
// generateAdminNamespaceYaml()
pushGitopsRepo() pushGitopsRepo()
} }
...@@ -189,7 +186,7 @@ pipeline { ...@@ -189,7 +186,7 @@ pipeline {
post { post {
failure { failure {
script { 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 { ...@@ -225,13 +222,13 @@ pipeline {
FAILED_STAGE = env.STAGE_NAME FAILED_STAGE = env.STAGE_NAME
waitForAdminRollout(env.ADMIN_BEZEICHNER) waitForAdminRollout(env.ADMIN_BEZEICHNER)
waitForOzgCloudStackRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER]) // waitForOzgCloudStackRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER])
} }
} }
post { post {
failure { failure {
script { 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 { ...@@ -257,67 +254,67 @@ pipeline {
// failFast false // failFast false
// parallel { // parallel {
stage('E2E-Alfa-EA') { // stage('E2E-Alfa-EA') {
when { // when {
expression { !SKIP_RUN } // expression { !SKIP_RUN }
} // }
steps { // steps {
catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { // catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
script { // script {
def bezeichner = env.EA_BEZEICHNER // def bezeichner = env.EA_BEZEICHNER
//
Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner)) // Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner))
//
runTests(bezeichner, 'alfa-e2e', 'einheitlicher-ansprechpartner', env.KEYCLOAK_CLIENT_ALFA_APP, mongoDbPort, env.STAGE_NAME) // runTests(bezeichner, 'alfa-e2e', 'einheitlicher-ansprechpartner', env.KEYCLOAK_CLIENT_ALFA_APP, mongoDbPort, env.STAGE_NAME)
//
stopForwardMongoDbPort(generateNamespace(bezeichner)) // stopForwardMongoDbPort(generateNamespace(bezeichner))
} // }
} // }
} // }
post { // post {
failure { // failure {
script { // script {
FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} " // FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} "
} // }
} // }
always { // always {
script { // script {
publishAlfaE2ETestResult("einheitlicher-ansprechpartner", "Alfa E2E-Tests EA") // publishAlfaE2ETestResult("einheitlicher-ansprechpartner", "Alfa E2E-Tests EA")
} // }
} // }
} // }
} // }
//
stage('E2E-Alfa-Main') { // stage('E2E-Alfa-Main') {
when { // when {
expression { !SKIP_RUN } // expression { !SKIP_RUN }
} // }
steps { // steps {
catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { // catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
script { // script {
def bezeichner = env.MAIN_BEZEICHNER // def bezeichner = env.MAIN_BEZEICHNER
//
Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner)) // Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner))
//
runTests(bezeichner, 'alfa-e2e', 'main-tests', env.KEYCLOAK_CLIENT_ALFA_APP, mongoDbPort, env.STAGE_NAME) // runTests(bezeichner, 'alfa-e2e', 'main-tests', env.KEYCLOAK_CLIENT_ALFA_APP, mongoDbPort, env.STAGE_NAME)
//
stopForwardMongoDbPort(generateNamespace(bezeichner)) // stopForwardMongoDbPort(generateNamespace(bezeichner))
} // }
} // }
} // }
post { // post {
failure { // failure {
script { // script {
FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} " // FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} "
} // }
} // }
always { // always {
script { // script {
publishAlfaE2ETestResult("main-tests", "Alfa E2E-Tests main") // publishAlfaE2ETestResult("main-tests", "Alfa E2E-Tests main")
} // }
} // }
} // }
} // }
stage('E2E-Admin-Main') { stage('E2E-Admin-Main') {
when { when {
expression { !SKIP_RUN } expression { !SKIP_RUN }
...@@ -359,7 +356,7 @@ pipeline { ...@@ -359,7 +356,7 @@ pipeline {
script { script {
FAILED_STAGE = env.STAGE_NAME 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() { ...@@ -530,13 +527,14 @@ Void checkoutGitopsE2eBranch() {
} }
} }
Void generateAllNamespaces() { Void generateNamespaces() {
def y1 = generateAdminNamespaceYaml() def y1 = generateAdminNamespaceYaml()
def y2 = generateEaNamespaceYaml() // def y2 = generateEaNamespaceYaml()
def y3 = generateMainNamespaceYaml() // def y3 = generateMainNamespaceYaml()
dir("gitops") { 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'" sh "git commit -m 'add e2e namespaces for testrun'"
} }
...@@ -594,7 +592,7 @@ String writeYamlToGitOps(String bezeichner, Object envValues){ ...@@ -594,7 +592,7 @@ String writeYamlToGitOps(String bezeichner, Object envValues){
return bezeichnerYaml; return bezeichnerYaml;
} }
Void deleteOzgCloudStack(ozgCloudBezeichner) { Void deleteNamespaces(ozgCloudBezeichner) {
for(bezeichner in ozgCloudBezeichner) { for(bezeichner in ozgCloudBezeichner) {
if (hasNamespaceFile(bezeichner)) { if (hasNamespaceFile(bezeichner)) {
removeNamespaceFile(bezeichner) removeNamespaceFile(bezeichner)
...@@ -701,9 +699,6 @@ Void publishE2ETestResult(String appName, String appVariant, String reportName) ...@@ -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) { String runTests(String bezeichner, String appName, String appVariant, String keycloakClientName, Integer dbPort, String stageName) {
def config = generateCypressConfig(bezeichner, appName, appVariant, keycloakClientName, dbPort) def config = generateCypressConfig(bezeichner, appName, appVariant, keycloakClientName, dbPort)
try { try {
......
alfa-client/apps/admin-e2e/cypress-ci.json
+ 1
− 1
View file @ 3011ea76
{ {
"env": { "env": {
"database": "vorgang-manager-database", "database": "vorgang-manager-database",
"keycloakClient": "alfa" "keycloakClient": "admin"
}, },
"fileServerFolder": ".", "fileServerFolder": ".",
"fixturesFolder": "./src/fixtures", "fixturesFolder": "./src/fixtures",
......
alfa-client/apps/admin-e2e/src/fixtures/argocd/by-admin-dev.yaml
+ 20
− 20
View file @ 3011ea76
...@@ -14,26 +14,26 @@ admin_client: ...@@ -14,26 +14,26 @@ admin_client:
enabled: true enabled: true
ingress: ingress:
use_staging_cert: true use_staging_cert: true
#
alfa: #alfa:
env: # env:
overrideSpringProfiles: "oc,e2e,dev" # overrideSpringProfiles: "oc,e2e,dev"
ingress: # ingress:
use_staging_cert: true # use_staging_cert: true
#
vorgang_manager: #vorgang_manager:
env: # env:
overrideSpringProfiles: "oc,e2e,dev" # overrideSpringProfiles: "oc,e2e,dev"
elasticsearch: # elasticsearch:
enabled: true # enabled: true
#
user_manager: #user_manager:
ozgcloud: # ozgcloud:
usersync: # usersync:
onstart: false # onstart: false
period: disabled # period: disabled
ingress: # ingress:
use_staging_cert: true # use_staging_cert: true
smocker: smocker:
enabled: false enabled: false
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit