OZG-4653 OZG-4708 remove parameter from Jenkinsfile

alfa-client/apps/alfa-e2e/Jenkinsfile

@@ -439,7 +439,9 @@ Void generateMainNamespaceYaml() {
 }
 
 Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String userFolder) {
-    def envValues = readYaml file: "alfa-client/apps/alfa-e2e/src/fixtures/argocd/" + valuesPathSuffix;
+	def envValues
+	dir('alfa-client/apps/alfa-e2e/') {
+		envValues = readYaml file: "src/fixtures/argocd/" + valuesPathSuffix;
 
 		envValues.ozgcloud.bezeichner = bezeichner
 		envValues.alfa.put("image", ['tag': env.ALFA_IMAGE_TAG])
@@ -452,7 +454,8 @@ Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String us
 		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('alfa-client/apps/alfa-e2e/src/fixtures', userFolder))
+		envValues.alfa.sso.put("keycloak_users", generateKeycloakUserForHelmChart(userFolder))
+	}
 
     writeYaml file: "gitops/dev/namespace/namespaces/by-${bezeichner}-dev.yaml", data: envValues, overwrite: true
 
@@ -464,10 +467,10 @@ Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String us
     }
 }
 
-List generateKeycloakUserForHelmChart(String fixturesPath, String userFolder) {
+List generateKeycloakUserForHelmChart(String userFolder) {
     def helmUsers = []
 
-    readUsersFixtures(fixturesPath, userFolder).each { username, userFixture ->
+    readUsersFixtures(userFolder).each { username, userFixture ->
         def user = [
             "name"      : userFixture.name,
             "password"  : userFixture.password,
@@ -501,12 +504,12 @@ List mapUserClientRoles(userClientRoles) {
 }
 
 List generateKeycloakGroupsForHelmChart() {
-    def groupFiles = sh (script: 'ls alfa-client/apps/alfa-e2e/src/fixtures/group', returnStdout: true)
+    def groupFiles = sh (script: 'ls src/fixtures/group', returnStdout: true)
 
     def helmGroups = []
 
     groupFiles.split("\\n").each { groupFile ->
-        def groupJson = readJSON file: "alfa-client/apps/alfa-e2e/src/fixtures/group/${groupFile}"
+        def groupJson = readJSON file: "src/fixtures/group/${groupFile}"
         def group = ["name": groupJson.name]
 
         groupJson.attributes.each { key, values ->
@@ -673,7 +676,7 @@ String generateCypressConfig(String bezeichner, String testFolder, String userFo
         config.env.dbUrl = "mongodb://${decodeString(vorgangManagerDatabaseSecret.username)}:${parsablePassword}@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String
         config.env.keycloakUrl = "https://${env.SSO_URL}/" as String
         config.env.keycloakRealm = namespace as String
-        config.env += createUserIdsEnv('src/fixtures', userFolder, namespace)
+        config.env += createUserIdsEnv(userFolder, namespace)
         config.videosFolder = "./reports/${testFolder}/videos" as String
         config.screenshotsFolder = "./reports/${testFolder}/screenshots" as String
         config.reporterOptions.reportDir = "./reports/${testFolder}/mochawesome-report" as String
@@ -714,9 +717,9 @@ Map getUserManagerDatabaseSecret(String namespace) {
     return readJSON ( text: sh (script: "kubectl get secret ozg-mongodb-admin-user-manager-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
 }
 
-Map createUserIdsEnv(String fixturesPath, String userFolder, realm) {
+Map createUserIdsEnv(String userFolder, realm) {
     def keycloakUsers = getKeycloakUsers(realm)
-    def usersFixtures = readUsersFixtures(fixturesPath, userFolder)
+    def usersFixtures = readUsersFixtures(userFolder)
     return usersFixtures.collectEntries { username, user ->
         [(username + "Uuid")      : keycloakUsers[username].id,
          (username + "InternalId"): keycloakUsers[username].attributes.ozgCloudUserId[0]]
@@ -735,11 +738,12 @@ Map getKeycloakUsers(realm) {
     return keycloakUsers.collectEntries { [it.username, it] }
 }
 
-Map readUsersFixtures(String fixturesPath, String userFolder) {
-    def usersFixturesFiles = sh(script: "ls ${fixturesPath}/${userFolder}", returnStdout: true);
+Map readUsersFixtures(String userFolder) {
+	def userFolderPath = "src/fixtures/${userFolder}"
+    def usersFixturesFiles = sh(script: "ls ${userFolderPath}", returnStdout: true);
     return usersFixturesFiles.split("\\n")
         .collect { userFixtureFile ->
-            def userFixture = readJSON file: "${fixturesPath}/${userFolder}/${userFixtureFile}"
+            def userFixture = readJSON file: "${userFolderPath}/${userFixtureFile}"
 			return createUserFromFixture(userFixture)
         }.collectEntries { [it.name, it] }
 }

alfa-client/apps/alfa-e2e/Jenkinsfile-static

@@ -385,7 +385,7 @@ String generateCypressConfig(String bezeichner, String testFolder, String userFo
         config.env.dbUrl = "mongodb://${decodeString(vorgangManagerDatabaseSecret.username)}:${parsablePassword}@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String
         config.env.keycloakUrl = "https://${env.SSO_URL}/" as String
         config.env.keycloakRealm = namespace as String
-        config.env += createUserIdsEnv('src/fixtures', userFolder, namespace)
+        config.env += createUserIdsEnv(userFolder, namespace)
         config.videosFolder = "./reports/${testFolder}/videos" as String
         config.screenshotsFolder = "./reports/${testFolder}/screenshots" as String
         config.reporterOptions.reportDir = "./reports/${testFolder}/mochawesome-report" as String
@@ -426,9 +426,9 @@ String makePasswordUrlConform(String password) {
     return sh(script: "printf %s ${password} | jq -sRr @uri", returnStdout: true);
 }
 
-Map createUserIdsEnv(String fixturesPath, String userFolder, realm) {
+Map createUserIdsEnv(String userFolder, realm) {
     def keycloakUsers = getKeycloakUsers(realm)
-    def usersFixtures = readUsersFixtures(fixturesPath, userFolder)
+    def usersFixtures = readUsersFixtures(userFolder)
     return usersFixtures.collectEntries { username, user ->
         [(username + "Uuid")      : keycloakUsers[username].id,
          (username + "InternalId"): keycloakUsers[username].attributes.ozgCloudUserId[0]]
@@ -447,11 +447,12 @@ Map getKeycloakUsers(realm) {
     return keycloakUsers.collectEntries { [it.username, it] }
 }
 
-Map readUsersFixtures(String fixturesPath, String userFolder) {
-	def usersFixturesFiles = sh(script: "ls ${fixturesPath}/${userFolder}", returnStdout: true);
+Map readUsersFixtures(String userFolder) {
+	def userFolderPath = "src/fixtures/${userFolder}"
+	def usersFixturesFiles = sh(script: "ls ${userFolderPath}", returnStdout: true);
 	return usersFixturesFiles.split("\\n")
 		.collect { userFixtureFile ->
-			def userFixture = readJSON file: "${fixturesPath}/${userFolder}/${userFixtureFile}"
+			def userFixture = readJSON file: "${userFolderPath}/${userFixtureFile}"
 			return createUserFromFixture(userFixture)
 		}.collectEntries { [it.name, it] }
 }