diff --git a/goofy-client/apps/alfa-e2e/Jenkinsfile b/goofy-client/apps/alfa-e2e/Jenkinsfile index 4e37f92976b8d8e35e62ea5fd0606ab1c852b001..bd7df68de0507a8fa8525b232b4a5f7014cfe561 100644 --- a/goofy-client/apps/alfa-e2e/Jenkinsfile +++ b/goofy-client/apps/alfa-e2e/Jenkinsfile @@ -452,7 +452,7 @@ Void generateMainNamespaceYaml() { } Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String userFolder) { - def envValues = readYaml file: "alfa/apps/alfa-e2e/src/fixtures/argocd/" + valuesPathSuffix; + def envValues = readYaml file: "goofy-client/apps/alfa-e2e/src/fixtures/argocd/" + valuesPathSuffix; envValues.kop.bezeichner = bezeichner envValues.goofy.put("image", ['tag': env.GOOFY_IMAGE_TAG]) @@ -478,12 +478,12 @@ Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String us } List generateKeycloakUserForHelmChart(String userFolder) { - def userFiles = sh (script: 'ls alfa/apps/alfa-e2e/src/fixtures/' + userFolder, returnStdout: true); + def userFiles = sh (script: 'ls goofy-client/apps/alfa-e2e/src/fixtures/' + userFolder, returnStdout: true); def helmUsers = [] userFiles.split("\\n").each { userFile -> - def userJson = readJSON file: "alfa/apps/alfa-e2e/src/fixtures/${userFolder}/${userFile}" + def userJson = readJSON file: "goofy-client/apps/alfa-e2e/src/fixtures/${userFolder}/${userFile}" def user = [ "name": userJson.name, "password": userJson.password, @@ -517,12 +517,12 @@ List mapUserClientRoles(userClientRoles) { } List generateKeycloakGroupsForHelmChart() { - def groupFiles = sh (script: 'ls alfa/apps/alfa-e2e/src/fixtures/group', returnStdout: true) + def groupFiles = sh (script: 'ls goofy-client/apps/alfa-e2e/src/fixtures/group', returnStdout: true) def helmGroups = [] groupFiles.split("\\n").each { groupFile -> - def groupJson = readJSON file: "alfa/apps/alfa-e2e/src/fixtures/group/${groupFile}" + def groupJson = readJSON file: "goofy-client/apps/alfa-e2e/src/fixtures/group/${groupFile}" def group = ["name": groupJson.name] groupJson.attributes.each { key, values -> @@ -624,7 +624,7 @@ Void publishE2ETestResult(String reportFolder, String reportName) { allowMissing: false, alwaysLinkToLastBuild: false, keepAll: true, - reportDir: "alfa/apps/alfa-e2e/reports/${reportFolder}", + reportDir: "goofy-client/apps/alfa-e2e/reports/${reportFolder}", reportFiles: 'report.html', reportName: reportName ] @@ -678,7 +678,7 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor def namespace = generateNamespace(bezeichner) def configName = "cypress-ci-"+testFolder+".json" - dir('alfa/apps/alfa-e2e/'){ + dir('goofy-client/apps/alfa-e2e/'){ def config = readJSON file: 'cypress-ci.json' def vorgangManagerDatabaseSecret = getVorgangManagerDatabaseSecret(namespace); diff --git a/goofy-client/apps/alfa-e2e/Jenkinsfile-static b/goofy-client/apps/alfa-e2e/Jenkinsfile-static index 853dd23f83381182ffd57992f063b153f2373545..78e8beb6569935a803bd4081ab3ae28be0121ac8 100644 --- a/goofy-client/apps/alfa-e2e/Jenkinsfile-static +++ b/goofy-client/apps/alfa-e2e/Jenkinsfile-static @@ -333,7 +333,7 @@ String runTests(String bezeichner, String reportFolder, Integer dbPort, String s try { dir('goofy-client') { sh "npm run cypress:version" - sh "apps/goofy-e2e/run-tests.sh ${reportFolder} ${config}" + sh "apps/alfa-e2e/run-tests.sh ${reportFolder} ${config}" } } catch (Exception e) { printNpmDebugLog()