Merge branch 'main' into OZG-6989-Bugfixes

alfa-client/Jenkinsfile.e2e

@@ -452,14 +452,6 @@ String getHelmRepoUrl() {
     return "https://nexus.ozg-sh.de/repository/ozg-base-apps-snapshot"
 }
 
-String getFeatureBranchImageTag() {
-    return "${env.BRANCH_NAME}-${getRootPomVersion()}"
-}
-
-String getFeatureBranchHelmChartVersion() {
-    return "${getRootPomVersion()}-${env.BRANCH_NAME}".replaceAll("_", "-")
-}
-
 String getRootPomVersion() {
     def rootPom = readMavenPom file: 'pom.xml'
 
@@ -479,17 +471,10 @@ Void initEnvAdminDefaultVersions() {
 }
 
 Void initEnvAlfaDefaultVersions() {
-  if (isMasterBranch() || isReleaseBranch()) {
-    values = getApplicationValues('alfa')
+    def values = getApplicationValues('alfa')
 
     env.ALFA_IMAGE_TAG = getImageTag(values)
     env.ALFA_HELM_CHART_VERSION = getHelmChartVersion(values)
-  }
-  else {
-    env.ALFA_IMAGE_TAG = getFeatureBranchImageTag()
-    env.ALFA_HELM_CHART_VERSION = getFeatureBranchHelmChartVersion()
-  }
-
     env.ALFA_HELM_REPO_URL = getHelmRepoUrl()
 }
 

alfa-client/apps/admin-e2e/src/fixtures/argocd/by-admin-dev.yaml

@@ -28,11 +28,27 @@ ozgcloud:
 e2eTest: true
 project:
   destinations:
-    - namespace: "*"
+    - namespace: '*'
       server: https://kubernetes.default.svc
 
 administration:
   enabled: true
+  sso:
+    keycloak_users:
+      - name: ariane
+        email: ariane.admin@ozg-sh.de
+        first_name: Ariane
+        last_name: Admin
+        password: 'Y9nk43yrQ_zzIPpfFU-I'
+        update_user: true
+        groups: []
+        client_roles:
+          - name: admin
+            role: ADMIN_ADMIN
+          - name: realm-management
+            role: query-groups
+          - name: realm-management
+            role: manage-users
 
 admin_client:
   enabled: true
@@ -41,13 +57,13 @@ admin_client:
 
 alfa:
   env:
-    overrideSpringProfiles: "oc,e2e,dev"
+    overrideSpringProfiles: 'oc,e2e,dev'
   ingress:
     use_staging_cert: true
 
 vorgang_manager:
   env:
-    overrideSpringProfiles: "oc,e2e,dev"
+    overrideSpringProfiles: 'oc,e2e,dev'
 
 user_manager:
   ozgcloud:

alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml

@@ -45,6 +45,92 @@ alfa:
       bescheid:
         - formEngineName: FormSolutions
           formId: KFAS_STAGE_KI_10_Haltverbot_LANDESHACKATHON
+  sso:
+    keycloak_users:
+    - name: ludwig
+      first_name: Ludwig
+      last_name: Löscher
+      email: testerozg+ludwig@gmail.com
+      password: 'Y9nk43yrQ_zzIPpfFU-I'
+      update_user: true
+      groups:
+      - Bauamt
+      - Fundstelle
+      - Ordnungsamt
+      client_roles:
+      - name: alfa
+        role: VERWALTUNG_LOESCHEN
+    - name: sabine
+      first_name: Sabine
+      last_name: Sach
+      email: testerozg+sabine@gmail.com
+      password: 'Y9nk43yrQ_zzIPpfFU-I'
+      update_user: true
+      groups:
+      - Ordnungsamt
+      client_roles:
+      - name: alfa
+        role: VERWALTUNG_USER
+    - name: adelheit
+      first_name: Adelheit
+      last_name: Allzweck
+      email: adelheit.alzweck@ozg-sh.de
+      password: 'Y9nk43yrQ_zzIPpfFU-I'
+      update_user: true
+      groups:
+      - Fundstelle
+      client_roles:
+      - name: alfa
+        role: VERWALTUNG_USER
+    - name: dorothea
+      first_name: Dorothea
+      last_name: Doe
+      email: testerozg+dorothea@gmail.com
+      password: 'Y9nk43yrQ_zzIPpfFU-I'
+      update_user: true
+      groups:
+      - Bauamt
+      - Fundstelle
+      - Ordnungsamt
+      client_roles:
+      - name: alfa
+        role: VERWALTUNG_USER
+    - name: zonk
+      first_name: Zacharias
+      last_name: Zonk
+      email: zacharias.zonk@ozg-sh.de
+      password: 'Y9nk43yrQ_zzIPpfFU-I'
+      update_user: true
+      client_roles:
+      - name: alfa
+        role: VERWALTUNG_USER
+    - name: richard
+      first_name: Richard
+      last_name: Rollenlos
+      email: richard.rollenlos@ozg-sh.de
+      password: 'Y9nk43yrQ_zzIPpfFU-I'
+      update_user: true
+    - name: peter
+      first_name: Peter
+      last_name: von der Post
+      email: peter.von.der.post@ozg-sh.de
+      password: 'Y9nk43yrQ_zzIPpfFU-I'
+      update_user: true
+      client_roles:
+      - name: alfa
+        role: VERWALTUNG_POSTSTELLE
+    - name: zelda
+      first_name: Zelda
+      last_name: Zusammen
+      email: zelda.zusammen@ozg-sh.de
+      password: 'Y9nk43yrQ_zzIPpfFU-I'
+      update_user: true
+      groups:
+      - Denkmalpflege
+      - Wirtschaftsförderung
+      client_roles:
+      - name: alfa
+        role: VERWALTUNG_USER
 
 vorgang_manager:
   env: