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

OZG-3934 Use new Cypress configuration parameter

parent f41713dd
No related branches found
No related tags found
No related merge requests found
...@@ -614,12 +614,12 @@ Void publishE2ETestResult(String reportFolder, String reportName) { ...@@ -614,12 +614,12 @@ Void publishE2ETestResult(String reportFolder, String reportName) {
} }
String runTests(String bezeichner, String reportFolder, Integer dbPort, String stageName) { String runTests(String bezeichner, String reportFolder, Integer dbPort, String stageName) {
def configFile = generateCypressConfig(bezeichner, reportFolder, dbPort) def config = generateCypressConfig(bezeichner, reportFolder, dbPort)
try { try {
dir("goofy-client") { dir("goofy-client") {
sh "npm run cypress:version" sh "npm run cypress:version"
sh "npm run cypress:ci-run --CONFIG_FILE=${configFile} --REPORT_FOLDER=${reportFolder}" sh "npm run cypress:ci-run --CONFIG='${config}' --REPORT_FOLDER=${reportFolder}"
} }
} catch (Exception e) { } catch (Exception e) {
printNpmDebugLog() printNpmDebugLog()
...@@ -658,10 +658,6 @@ String cutBranchNameForKeycloakRealm(String branchName, String stageName) { ...@@ -658,10 +658,6 @@ String cutBranchNameForKeycloakRealm(String branchName, String stageName) {
String generateCypressConfig(String bezeichner, String testFolder, Integer dbPort) { String generateCypressConfig(String bezeichner, String testFolder, Integer dbPort) {
def namespace = generateNamespace(bezeichner) def namespace = generateNamespace(bezeichner)
def configName = "cypress-ci-"+testFolder+".json"
dir('goofy-client/apps/goofy-e2e/'){
def config = readJSON file: 'cypress-ci.json'
def plutoDatabaseSecret = getPlutoDatabaseSecret(namespace); def plutoDatabaseSecret = getPlutoDatabaseSecret(namespace);
def decodedPassword = decodeString(plutoDatabaseSecret.password); def decodedPassword = decodeString(plutoDatabaseSecret.password);
...@@ -681,12 +677,7 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor ...@@ -681,12 +677,7 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
config.env.put("search", getElasticsearchEnv(namespace)) config.env.put("search", getElasticsearchEnv(namespace))
config.env.put("userManager", getUserManagerEnv(namespace, dbPort)) config.env.put("userManager", getUserManagerEnv(namespace, dbPort))
writeJSON file: configName, json: config return JSONObject.fromObject(config)
sh "cat ${configName}"
}
return configName
} }
String makePasswordUrlConform(String password) { String makePasswordUrlConform(String password) {
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
"cypress:version": "npx cypress version", "cypress:version": "npx cypress version",
"cypress:install": "npx cypress install", "cypress:install": "npx cypress install",
"cypress:open": "npx cypress open --project apps/goofy-e2e", "cypress:open": "npx cypress open --project apps/goofy-e2e",
"cypress:ci-run": "npm run cypress:delete-old-reports --REPORT_FOLDER=${npm_config_report_folder} ; NO_COLOR=1 npm run cypress:run -- --env cypressCiJsonFile=${npm_config_config_file} ; test=$(echo \"$?\") ; npm run cypress:pre-merge --REPORT_FOLDER=${npm_config_report_folder} ; npm run cypress:generate-report --REPORT_FOLDER=${npm_config_report_folder} ; exit $test", "cypress:ci-run": "npm run cypress:delete-old-reports --REPORT_FOLDER=${npm_config_report_folder} ; NO_COLOR=1 npm run cypress:run -- --config=${npm_config_config} ; test=$(echo \"$?\") ; npm run cypress:pre-merge --REPORT_FOLDER=${npm_config_report_folder} ; npm run cypress:generate-report --REPORT_FOLDER=${npm_config_report_folder} ; exit $test",
"cypress:delete-old-reports": "REPORT_FOLDER=${npm_config_report_folder} node apps/goofy-e2e/src/support/delete-old-reports.ts", "cypress:delete-old-reports": "REPORT_FOLDER=${npm_config_report_folder} node apps/goofy-e2e/src/support/delete-old-reports.ts",
"cypress:pre-merge": "REPORT_FOLDER=${npm_config_report_folder} node apps/goofy-e2e/src/support/pre-merge.ts", "cypress:pre-merge": "REPORT_FOLDER=${npm_config_report_folder} node apps/goofy-e2e/src/support/pre-merge.ts",
"cypress:generate-report": "npm run cypress:merge-report --REPORT_FOLDER=${npm_config_report_folder} ; npm run cypress:generate-html --REPORT_FOLDER=${npm_config_report_folder}", "cypress:generate-report": "npm run cypress:merge-report --REPORT_FOLDER=${npm_config_report_folder} ; npm run cypress:generate-html --REPORT_FOLDER=${npm_config_report_folder}",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment