diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile
index eca38dd16248ecdb8ffd648482e74a0cbbd5f168..3c6516e22b426719c7453bacf30da69c60eb0826 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 {
@@ -238,6 +241,9 @@ pipeline {
}
stage('E2E-Main') {
+ when {
+ expression { !SKIP_RUN }
+ }
steps {
catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
script {
@@ -263,8 +269,8 @@ pipeline {
}
}
}
- }
- }
+// }
+// }
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)) {
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-detail/vorgang-wiedereroeffnen.ea.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-detail/vorgang-wiedereroeffnen.ea.cy.ts
index 24108803003bd16018090b7b71ee0e9a6180c29d..1f5f74d71c2f8ef90e78c0332c01d5d206cf0969 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-detail/vorgang-wiedereroeffnen.ea.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-detail/vorgang-wiedereroeffnen.ea.cy.ts
@@ -106,11 +106,10 @@ describe('Vorgang wiedereroeffnen', () => {
});
it('should have status In Bearbeitung', () => {
- vorgangPage
- .getVorgangDetailHeader()
- .getStatus()
- .should('exist')
- .should('have.text', vorgangStatusLabelE2E[VorgangStatusE2E.IN_BEARBEITUNG]);
+ haveText(
+ vorgangPage.getVorgangDetailHeader().getStatus(),
+ vorgangStatusLabelE2E[VorgangStatusE2E.IN_BEARBEITUNG],
+ );
});
it('back to vorgang list', () => {
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml b/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml
index 20927351eff8ee54afdc44510f6c2ef4e6304cf2..c51a91fbe8027ec15a23a83008bb94c0ca39b838 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml
@@ -6,20 +6,25 @@ project:
destinations:
- namespace: '*'
server: https://kubernetes.default.svc
+
alfa:
env:
overrideSpringProfiles: 'oc,ea,e2e,dev'
sso:
- serverUrl: https://sso.dev.by.ozg-cloud.de
- apiPassword: 'Test1234!'
keycloak_clients:
- client_name: alfa
client_roles:
- name: EINHEITLICHER_ANSPRECHPARTNER
+ keycloak_users:
+ - name: emil
+ first_name: Emil
+ last_name: Ansprechpartner
+ password: "Y9nk43yrQ_zzIPpfFU-I"
+ client_roles:
+ - name: alfa
+ role: EINHEITLICHER_ANSPRECHPARTNER
ingress:
use_staging_cert: true
- className: openshift-default
- baseUrl: dev.by.ozg-cloud.de
vorgang_manager:
env:
@@ -44,28 +49,8 @@ user_manager:
ozgcloud:
usersync:
onstart: true
- keycloak:
- api:
- password: 'Test1234!'
- sso:
- serverUrl: https://sso.dev.by.ozg-cloud.de
- api_user:
- name: usermanagerapiuser
- first_name: UserManager
- last_name: ApiUser
- realm_roles:
- - offline_access
- - uma_authorization
- client_roles:
- - name: realm-management
- role: view-users
- - name: realm-management
- role: manage-users
- baseUrl: dev.by.ozg-cloud.de
-
ingress:
use_staging_cert: true
- className: openshift-default
smocker:
enabled: false
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml b/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml
index c7234b086328954fdd04f1754e44d79cdc5d22a4..569f411da3884478eefd25a7e5636e906673a860 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml
@@ -9,13 +9,8 @@ project:
alfa:
env:
overrideSpringProfiles: 'oc,e2e,dev'
- sso:
- serverUrl: https://sso.dev.by.ozg-cloud.de
- apiPassword: 'Test1234!'
ingress:
use_staging_cert: true
- className: openshift-default
- baseUrl: dev.by.ozg-cloud.de
vorgang_manager:
env:
@@ -40,28 +35,8 @@ user_manager:
ozgcloud:
usersync:
onstart: true
- keycloak:
- api:
- password: 'Test1234!'
- sso:
- serverUrl: https://sso.dev.by.ozg-cloud.de
- api_user:
- name: usermanagerapiuser
- first_name: UserManager
- last_name: ApiUser
- realm_roles:
- - offline_access
- - uma_authorization
- client_roles:
- - name: realm-management
- role: view-users
- - name: realm-management
- role: manage-users
- baseUrl: dev.by.ozg-cloud.de
-
ingress:
use_staging_cert: true
- className: openshift-default
smocker:
enabled: false
diff --git a/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts b/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts
index 935ac6d7042933627651ef0d7aa425ff9ab7b183..9d4300f76bf0b807f639f732bd36902d7406aa35 100644
--- a/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts
+++ b/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts
@@ -41,7 +41,7 @@ export function notExist(element: any): void {
}
export function haveText(element: any, text: string): void {
- element.should('have.text', text);
+ element.invoke("text").then((elementText) => elementText.trim()).should("equal", text);
}
export function haveValue(element: any, value: string): void {