OZG-3961 move user files so spezific folder; adjust JenkinsFile

goofy-client/apps/goofy-e2e/Jenkinsfile

@@ -426,15 +426,15 @@ Void checkoutGitopsE2eBranch() {
 }
 
 Void generateEaNamespaceYaml() {
-    generateNamespaceYaml(env.EA_BEZEICHNER, "goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-ea-dev.yaml")
+    generateNamespaceYaml(env.EA_BEZEICHNER, "by-ea-dev.yaml", "user-ea");
 }
 
 Void generateMainNamespaceYaml() {
-    generateNamespaceYaml(env.MAIN_BEZEICHNER, "goofy-client/apps/goofy-e2e/src/fixtures/argocd/by-main-dev.yaml")
+    generateNamespaceYaml(env.MAIN_BEZEICHNER, "by-main-dev.yaml", "user-main");
 }
 
-Void generateNamespaceYaml(String bezeichner, String valuesPath) {
-    def envValues = readYaml file: valuesPath
+Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String userFolder) {
+    def envValues = readYaml file: "goofy-client/apps/goofy-e2e/src/fixtures/argocd/" + valuesPathSuffix;
 
     envValues.kop.bezeichner = bezeichner
     envValues.goofy.put("image", ['tag': env.GOOFY_IMAGE_TAG])
@@ -447,7 +447,7 @@ Void generateNamespaceYaml(String bezeichner, String valuesPath) {
     envValues.user_manager.put("helm", ['version': env.USER_MANAGER_HELM_CHART_VERSION, 'repoUrl': env.USER_MANAGER_HELM_REPO_URL])
 
     envValues.goofy.sso.put("keycloak_groups", generateKeycloakGroupsForHelmChart())
-    envValues.goofy.sso.put("keycloak_users", generateKeycloakUserForHelmChart())
+    envValues.goofy.sso.put("keycloak_users", generateKeycloakUserForHelmChart(userFolder))
 
     writeYaml file: "gitops/dev/namespace/namespaces/by-${bezeichner}-dev.yaml", data: envValues, overwrite: true
 
@@ -459,8 +459,8 @@ Void generateNamespaceYaml(String bezeichner, String valuesPath) {
     }
 }
 
-List generateKeycloakUserForHelmChart() {
-    def userFiles = sh (script: 'ls goofy-client/apps/goofy-e2e/src/fixtures/user-ea', returnStdout: true)
+List generateKeycloakUserForHelmChart(String userFolder) {
+    def userFiles = sh (script: 'ls goofy-client/apps/goofy-e2e/src/fixtures/' + userFolder, returnStdout: true);
 
     def helmUsers = []
 

goofy-client/apps/goofy-e2e/src/fixtures/user/user_emil.json

-{
-	"id": "63284e54c39b316b2ad02e2a",
-	"name": "emil",
-	"password": "Y9nk43yrQ_zzIPpfFU-I",
-	"firstName": "Emil",
-	"lastName": "Ansprechpartner",
-	"fullName": "Emil Ansprechpartner",
-	"initials": "EA",
-	"dataTestId": "Emil_Ansprechpartner",
-	"clientRoles": ["EINHEITLICHER_ANSPRECHPARTNER"]
-}
\ No newline at end of file

goofy-client/apps/goofy-e2e/src/support/user-util.ts

@@ -25,8 +25,8 @@ import { UserE2E } from '../model/user';
 import { UsermanagerUserE2E } from '../model/usermanager';
 import { getCypressEnv, initUsermanagerData, login } from './cypress-helper';
 
-const sabineFixture: UserE2E = require('../fixtures/user/user_sabine.json');
-const dorotheaFixture: UserE2E = require('../fixtures/user/user_dorothea.json');
+const sabineFixture: UserE2E = require('../fixtures/user-main/user_sabine.json');
+const dorotheaFixture: UserE2E = require('../fixtures/user-main/user_dorothea.json');
 
 const userManagerSabineFixture: UsermanagerUserE2E = require('../fixtures/usermanager/usermanager_user_sabine.json');
 const userManagerPeterFixture: UsermanagerUserE2E = require('../fixtures/usermanager/usermanager_user_peter.json');
@@ -72,14 +72,14 @@ export function getUserManagerUserDorothea(): UsermanagerUserE2E {
 }
 
 enum DatabaseUser {
-	EMIL = 'user/user_emil.json',
-	KFINDER = 'user/user_kfinder.json',
-	KORDNER = 'user/user_kordner.json',
-	LUDWIG = 'user/user_ludwig.json',
-	PETER = 'user/user_peter.json',
-	RICHARD = 'user/user_richard.json',
-	SABINE = 'user/user_sabine.json',
-	ZONK = 'user/user_zonk.json'
+	EMIL = 'user-ea/user_emil.json',
+	KFINDER = 'user-main/user_kfinder.json',
+	KORDNER = 'user-main/user_kordner.json',
+	LUDWIG = 'user-main/user_ludwig.json',
+	PETER = 'user-main/user_peter.json',
+	RICHARD = 'user-main/user_richard.json',
+	SABINE = 'user-main/user_sabine.json',
+	ZONK = 'user-main/user_zonk.json'
 }
 
 export function loginAsEmil(): void {