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

OZG-6592: Change Jenkinsfile for new directory/script structure

parent 2730479d
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
alfa-client/Jenkinsfile.e2e
+ 51
− 45
View file @ a243751b
...@@ -254,7 +254,7 @@ pipeline { ...@@ -254,7 +254,7 @@ pipeline {
Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner)) Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner))
runTests(bezeichner, 'einheitlicher-ansprechpartner', mongoDbPort, env.STAGE_NAME) runTests(bezeichner, 'alfa-e2e','einheitlicher-ansprechpartner', mongoDbPort, env.STAGE_NAME)
stopForwardMongoDbPort(generateNamespace(bezeichner)) stopForwardMongoDbPort(generateNamespace(bezeichner))
} }
...@@ -285,7 +285,7 @@ pipeline { ...@@ -285,7 +285,7 @@ pipeline {
Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner)) Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner))
runTests(bezeichner, 'main-tests', mongoDbPort, env.STAGE_NAME) runTests(bezeichner, 'alfa-e2e','main-tests', mongoDbPort, env.STAGE_NAME)
stopForwardMongoDbPort(generateNamespace(bezeichner)) stopForwardMongoDbPort(generateNamespace(bezeichner))
} }
...@@ -311,11 +311,11 @@ pipeline { ...@@ -311,11 +311,11 @@ pipeline {
steps { steps {
catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
script { script {
def bezeichner = env.MAIN_BEZEICHNER String bezeichner = env.MAIN_BEZEICHNER
Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner)) Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner))
runTests(bezeichner, 'main-tests', mongoDbPort, env.STAGE_NAME) runTests(bezeichner, 'admin-e2e','main-tests', mongoDbPort, env.STAGE_NAME)
stopForwardMongoDbPort(generateNamespace(bezeichner)) stopForwardMongoDbPort(generateNamespace(bezeichner))
} }
...@@ -329,7 +329,7 @@ pipeline { ...@@ -329,7 +329,7 @@ pipeline {
} }
always { always {
script { script {
publishAdminE2ETestResult("main-tests", "Admin E2E-Tests main") publishAdminE2ETestResult()
} }
} }
} }
...@@ -612,15 +612,17 @@ Void waitForHealthyStatus(String bezeichner, String application) { ...@@ -612,15 +612,17 @@ Void waitForHealthyStatus(String bezeichner, String application) {
sh "kubectl wait --for=jsonpath='{.status.health.status}'=Healthy applications/by-${bezeichner}-dev-${application} -n argocd --timeout=900s" sh "kubectl wait --for=jsonpath='{.status.health.status}'=Healthy applications/by-${bezeichner}-dev-${application} -n argocd --timeout=900s"
} }
Void publishAlfaE2ETestResult(String reportFolder, String reportName) { Void publishAlfaE2ETestResult(String appVariant, String reportName) {
publishE2ETestResult2("alfa-client/apps/alfa-e2e/reports/${reportFolder}", reportName) publishE2ETestResult("alfa-e2e", appVariant, reportName);
} }
Void publishAdminE2ETestResult(String reportFolder, String reportName) { Void publishAdminE2ETestResult() {
publishE2ETestResult2("alfa-client/apps/admin-e2e/reports/${reportFolder}", reportName) publishE2ETestResult("admin-e2e", "main-tests", "Admin E2E-Tests main");
} }
Void publishE2ETestResult2(String reportDir, String reportName) { Void publishE2ETestResult(String appName, String appVariant, String reportName) {
def reportDir = "alfa-client/apps/${appName}/reports/${appVariant}";
publishHTML ( publishHTML (
target: [ target: [
allowMissing: false, allowMissing: false,
...@@ -633,13 +635,15 @@ Void publishE2ETestResult2(String reportDir, String reportName) { ...@@ -633,13 +635,15 @@ Void publishE2ETestResult2(String reportDir, String reportName) {
) )
} }
String runTests(String bezeichner, String reportFolder, Integer dbPort, String stageName) { // runTests(env.EA_BEZEICHNER, 'alfa-e2e', 'einheitlicher-ansprechpartner', mongoDbPort, env.STAGE_NAME
def config = generateCypressConfig(bezeichner, reportFolder, dbPort) // runTests(env.EA_BEZEICHNER, 'alfa-e2e', 'main-tests', mongoDbPort, env.STAGE_NAME
// runTests(env.EA_BEZEICHNER, 'admin-e2e', 'main-tests', mongoDbPort, env.STAGE_NAME
String runTests(String bezeichner, String appName, String appVariant, Integer dbPort, String stageName) {
def config = generateCypressConfig(bezeichner, appName, appVariant, dbPort)
try { try {
dir('alfa-client'){ dir('alfa-client'){
sh "npm run cypress:version" sh "npm run cypress:version"
sh "apps/alfa-e2e/run-tests.sh ${reportFolder} ${config}" sh "apps/run-tests.sh ${appName} ${appVariant} ${config}"
} }
} catch (Exception e) { } catch (Exception e) {
printNpmDebugLog() printNpmDebugLog()
...@@ -676,11 +680,11 @@ String cutBranchNameForKeycloakRealm(String branchName, String stageName) { ...@@ -676,11 +680,11 @@ String cutBranchNameForKeycloakRealm(String branchName, String stageName) {
return branchName.take(cutBranchNamePosition) return branchName.take(cutBranchNamePosition)
} }
String generateCypressConfig(String bezeichner, String testFolder, Integer dbPort) { String generateCypressConfig(String bezeichner, String appName, String appVariant, Integer dbPort) {
def namespace = generateNamespace(bezeichner) def namespace = generateNamespace(bezeichner)
def configName = "cypress-ci-"+testFolder+".json" def configName = "cypress-ci-"+appVariant+".json"
dir('alfa-client/apps/alfa-e2e/'){ dir('alfa-client/apps/${appName}/'){
def config = readJSON file: 'cypress-ci.json' def config = readJSON file: 'cypress-ci.json'
def vorgangManagerDatabaseSecret = getVorgangManagerDatabaseSecret(namespace); def vorgangManagerDatabaseSecret = getVorgangManagerDatabaseSecret(namespace);
...@@ -691,11 +695,11 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor ...@@ -691,11 +695,11 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
config.env.dbUrl = "mongodb://${decodeString(vorgangManagerDatabaseSecret.username)}:${parsablePassword}@localhost:${dbPort}/admin?ssl=false&directConnection=true&socketTimeoutMS=30000&heartbeatFrequencyMS=10000" as String config.env.dbUrl = "mongodb://${decodeString(vorgangManagerDatabaseSecret.username)}:${parsablePassword}@localhost:${dbPort}/admin?ssl=false&directConnection=true&socketTimeoutMS=30000&heartbeatFrequencyMS=10000" as String
config.env.keycloakUrl = "https://${env.SSO_URL}/" as String config.env.keycloakUrl = "https://${env.SSO_URL}/" as String
config.env.keycloakRealm = namespace as String config.env.keycloakRealm = namespace as String
config.videosFolder = "./reports/${testFolder}/videos" as String config.videosFolder = "./reports/${appVariant}/videos" as String
config.screenshotsFolder = "./reports/${testFolder}/screenshots" as String config.screenshotsFolder = "./reports/${appVariant}/screenshots" as String
config.reporterOptions.reportDir = "./reports/${testFolder}/mochawesome-report" as String config.reporterOptions.reportDir = "./reports/${appVariant}/mochawesome-report" as String
config.specPattern = "src/e2e/${testFolder}/**/*.cy.{js,jsx,ts,tsx}" as String config.specPattern = "src/e2e/${appVariant}/**/*.cy.{js,jsx,ts,tsx}" as String
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))
...@@ -706,9 +710,11 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor ...@@ -706,9 +710,11 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
sh "cat ${configName}" sh "cat ${configName}"
} }
return "cypress-ci-"+testFolder+".config.ts" return "cypress-ci-"+appVariant+".config.ts"
} }
String makePasswordUrlConform(String password) { String makePasswordUrlConform(String password) {
return sh (script: "printf %s ${password} | jq -sRr @uri", returnStdout: true); return sh (script: "printf %s ${password} | jq -sRr @uri", returnStdout: true);
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit