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

OZG-3934 OZG-4395 adjust parameter; remove static values for config-generation

parent b0a1fe48
No related branches found
No related tags found
No related merge requests found
...@@ -606,13 +606,12 @@ Void publishE2ETestResult(String reportFolder, String reportName) { ...@@ -606,13 +606,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 config = generateCypressConfig(bezeichner, reportFolder, dbPort) def config = generateCypressConfig(bezeichner, reportFolder, dbPort)
def specFolder = "apps/goofy-e2e/src/e2e/${reportFolder}" def spec = "apps/goofy-e2e/src/e2e/${reportFolder}"
try { try {
dir('goofy-client'){ dir('goofy-client'){
sh "npm run cypress:version" sh "npm run cypress:version"
sh "ls -al" sh "npm run cypress:ci-run --CONFIG=${configFile} --REPORT_FOLDER=${reportFolder} --SPEC=${spec}"
sh "npm run cypress:ci-run --CONFIG_FILE=${configFile} --REPORT_FOLDER=${reportFolder}"
} }
} catch (Exception e) { } catch (Exception e) {
printNpmDebugLog() printNpmDebugLog()
...@@ -667,13 +666,9 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor ...@@ -667,13 +666,9 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
config.env.keycloakRealm = namespace as String config.env.keycloakRealm = namespace as String
config.env.keycloakClient = "alfa" as String config.env.keycloakClient = "alfa" as String
config.env.sabineUuid = getKeycloakUuid(namespace, "sabine") as String config.env.sabineUuid = getKeycloakUuid(namespace, "sabine") as String
config.video = false
config.videosFolder = "./reports/${testFolder}/videos" as String config.videosFolder = "./reports/${testFolder}/videos" as String
config.screenshotsFolder = "./reports/${testFolder}/screenshots" as String config.screenshotsFolder = "./reports/${testFolder}/screenshots" as String
config.reporterOptions.reportDir = "./reports/${testFolder}/mochawesome-report" as String config.reporterOptions.reportDir = "./reports/${testFolder}/mochawesome-report" as String
config.reporterOptions.quite = true
config.reporterOptions.overwrite = false
config.specPattern = 'src/e2e/**/*.cy.{js,jsx,ts,tsx}'
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))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment