diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile index eca38dd16248ecdb8ffd648482e74a0cbbd5f168..c66af4321dd65e0f7ba2368eb87e898dedbf2311 100644 --- a/alfa-client/apps/alfa-e2e/Jenkinsfile +++ b/alfa-client/apps/alfa-e2e/Jenkinsfile @@ -203,14 +203,17 @@ pipeline { } } - stage('Run E2E-Tests') { - when { - expression { !SKIP_RUN } - } - failFast false +// stage('Run E2E-Tests') { +// when { +// expression { !SKIP_RUN } +// } +// failFast false - parallel { +// parallel { stage('E2E-EA') { + when { + expression { !SKIP_RUN } + } steps { catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { script { @@ -237,34 +240,37 @@ pipeline { } } - stage('E2E-Main') { - steps { - catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { - script { - def bezeichner = env.MAIN_BEZEICHNER - def dbPort = 27019 - - forwardServices(generateNamespace(bezeichner), dbPort) - - runTests(bezeichner, 'main-tests', 'user-main', dbPort, env.STAGE_NAME) - } - } - } - post { - failure { - script { - FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} " - } - } - always { - script { - publishE2ETestResult("main-tests", "Alfa E2E-Tests main") - } - } - } - } - } - } +// stage('E2E-Main') { +// when { +// expression { !SKIP_RUN } +// } +// steps { +// catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { +// script { +// def bezeichner = env.MAIN_BEZEICHNER +// def dbPort = 27019 + +// forwardServices(generateNamespace(bezeichner), dbPort) + +// runTests(bezeichner, 'main-tests', 'user-main', dbPort, env.STAGE_NAME) +// } +// } +// } +// post { +// failure { +// script { +// FAILED_PARALLEL_STAGE += "${env.STAGE_NAME} " +// } +// } +// always { +// script { +// publishE2ETestResult("main-tests", "Alfa E2E-Tests main") +// } +// } +// } +// } +// } +// } stage('Delete E2E Namespaces') { when { @@ -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("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 @@ -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) { for(bezeichner in ozgCloudBezeichner) { if (hasNamespaceFile(bezeichner)) {