Skip to content
Snippets Groups Projects
Commit dfec5b5f authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4190 OZG-4560 One renaming step to fast - revert (3)

parent 751e1002
No related branches found
No related tags found
No related merge requests found
...@@ -452,7 +452,7 @@ Void generateMainNamespaceYaml() { ...@@ -452,7 +452,7 @@ Void generateMainNamespaceYaml() {
} }
Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String userFolder) { 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.kop.bezeichner = bezeichner
envValues.goofy.put("image", ['tag': env.GOOFY_IMAGE_TAG]) envValues.goofy.put("image", ['tag': env.GOOFY_IMAGE_TAG])
...@@ -478,12 +478,12 @@ Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String us ...@@ -478,12 +478,12 @@ Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String us
} }
List generateKeycloakUserForHelmChart(String userFolder) { 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 = [] def helmUsers = []
userFiles.split("\\n").each { userFile -> 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 = [ def user = [
"name": userJson.name, "name": userJson.name,
"password": userJson.password, "password": userJson.password,
...@@ -517,12 +517,12 @@ List mapUserClientRoles(userClientRoles) { ...@@ -517,12 +517,12 @@ List mapUserClientRoles(userClientRoles) {
} }
List generateKeycloakGroupsForHelmChart() { 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 = [] def helmGroups = []
groupFiles.split("\\n").each { groupFile -> 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] def group = ["name": groupJson.name]
groupJson.attributes.each { key, values -> groupJson.attributes.each { key, values ->
...@@ -624,7 +624,7 @@ Void publishE2ETestResult(String reportFolder, String reportName) { ...@@ -624,7 +624,7 @@ Void publishE2ETestResult(String reportFolder, String reportName) {
allowMissing: false, allowMissing: false,
alwaysLinkToLastBuild: false, alwaysLinkToLastBuild: false,
keepAll: true, keepAll: true,
reportDir: "alfa/apps/alfa-e2e/reports/${reportFolder}", reportDir: "goofy-client/apps/alfa-e2e/reports/${reportFolder}",
reportFiles: 'report.html', reportFiles: 'report.html',
reportName: reportName reportName: reportName
] ]
...@@ -678,7 +678,7 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor ...@@ -678,7 +678,7 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
def namespace = generateNamespace(bezeichner) def namespace = generateNamespace(bezeichner)
def configName = "cypress-ci-"+testFolder+".json" 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 config = readJSON file: 'cypress-ci.json'
def vorgangManagerDatabaseSecret = getVorgangManagerDatabaseSecret(namespace); def vorgangManagerDatabaseSecret = getVorgangManagerDatabaseSecret(namespace);
......
...@@ -333,7 +333,7 @@ String runTests(String bezeichner, String reportFolder, Integer dbPort, String s ...@@ -333,7 +333,7 @@ String runTests(String bezeichner, String reportFolder, Integer dbPort, String s
try { try {
dir('goofy-client') { dir('goofy-client') {
sh "npm run cypress:version" 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) { } catch (Exception e) {
printNpmDebugLog() printNpmDebugLog()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment