Skip to content
Snippets Groups Projects
Commit 2db7205b authored by OZGCloud's avatar OZGCloud
Browse files

e2e user aus gitops nutzen

parent 43832e0d
No related branches found
No related tags found
No related merge requests found
...@@ -203,14 +203,17 @@ pipeline { ...@@ -203,14 +203,17 @@ pipeline {
} }
} }
stage('Run E2E-Tests') { // stage('Run E2E-Tests') {
// when {
// expression { !SKIP_RUN }
// }
// failFast false
// parallel {
stage('E2E-EA') {
when { when {
expression { !SKIP_RUN } expression { !SKIP_RUN }
} }
failFast false
parallel {
stage('E2E-EA') {
steps { steps {
catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
script { script {
...@@ -237,34 +240,37 @@ pipeline { ...@@ -237,34 +240,37 @@ pipeline {
} }
} }
stage('E2E-Main') { // stage('E2E-Main') {
steps { // when {
catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { // expression { !SKIP_RUN }
script { // }
def bezeichner = env.MAIN_BEZEICHNER // steps {
def dbPort = 27019 // catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
// script {
forwardServices(generateNamespace(bezeichner), dbPort) // def bezeichner = env.MAIN_BEZEICHNER
// def dbPort = 27019
runTests(bezeichner, 'main-tests', 'user-main', dbPort, env.STAGE_NAME)
} // forwardServices(generateNamespace(bezeichner), dbPort)
}
} // runTests(bezeichner, 'main-tests', 'user-main', dbPort, env.STAGE_NAME)
post { // }
failure { // }
script { // }
FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} " // post {
} // failure {
} // script {
always { // FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} "
script { // }
publishE2ETestResult("main-tests", "Alfa E2E-Tests main") // }
} // always {
} // script {
} // publishE2ETestResult("main-tests", "Alfa E2E-Tests main")
} // }
} // }
} // }
// }
// }
// }
stage('Delete E2E Namespaces') { stage('Delete E2E Namespaces') {
when { when {
...@@ -452,9 +458,6 @@ Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String us ...@@ -452,9 +458,6 @@ Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String us
envValues.user_manager.put("image", ['tag': env.USER_MANAGER_IMAGE_TAG]) envValues.user_manager.put("image", ['tag': env.USER_MANAGER_IMAGE_TAG])
envValues.user_manager.put("helm", ['version': env.USER_MANAGER_HELM_CHART_VERSION, 'repoUrl': env.USER_MANAGER_HELM_REPO_URL]) envValues.user_manager.put("helm", ['version': env.USER_MANAGER_HELM_CHART_VERSION, 'repoUrl': env.USER_MANAGER_HELM_REPO_URL])
envValues.alfa.sso.put("keycloak_groups", generateKeycloakGroupsForHelmChart())
envValues.alfa.sso.put("keycloak_users", generateKeycloakUserForHelmChart(userFolder))
} }
writeYaml file: "gitops/dev/namespace/namespaces/by-${bezeichner}-dev.yaml", data: envValues, overwrite: true writeYaml file: "gitops/dev/namespace/namespaces/by-${bezeichner}-dev.yaml", data: envValues, overwrite: true
...@@ -467,66 +470,6 @@ Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String us ...@@ -467,66 +470,6 @@ Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String us
} }
} }
List generateKeycloakUserForHelmChart(String userFolder) {
def helmUsers = []
readUsersFixtures(userFolder).each { username, userFixture ->
def user = [
"name" : userFixture.name,
"password" : userFixture.password,
"first_name": userFixture.get("firstName", ""),
"last_name" : userFixture.get("lastName", ""),
"email" : userFixture.get("email", "")
]
if (userFixture.containsKey("clientRoles")) {
user.put("client_roles", mapUserClientRoles(userFixture.clientRoles))
}
if (userFixture.containsKey("groups")) {
user.put("groups", userFixture.groups)
}
helmUsers.add(user)
}
return helmUsers
}
List mapUserClientRoles(userClientRoles) {
def clientRoles = []
for(clientRole in userClientRoles) {
clientRoles.add(['name': 'alfa', 'role': clientRole])
}
return clientRoles
}
List generateKeycloakGroupsForHelmChart() {
def groupFiles = sh (script: 'ls src/fixtures/group', returnStdout: true)
def helmGroups = []
groupFiles.split("\\n").each { groupFile ->
def groupJson = readJSON file: "src/fixtures/group/${groupFile}"
def group = ["name": groupJson.name]
groupJson.attributes.each { key, values ->
if (!group.containsKey("attributes")) {
group.put("attributes", [["name": key, "value": values]])
}
else {
group.attributes.add(["name": key, "value": values])
}
}
helmGroups.add(group)
}
return helmGroups
}
Void deleteOzgCloudStack(ozgCloudBezeichner) { Void deleteOzgCloudStack(ozgCloudBezeichner) {
for(bezeichner in ozgCloudBezeichner) { for(bezeichner in ozgCloudBezeichner) {
if (hasNamespaceFile(bezeichner)) { if (hasNamespaceFile(bezeichner)) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment