diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile index 54eb9774cc8365c3e265f4adf6ab9fbc3e05324f..822f5f0909ca616cdb4d3b39370979f92ed5bd24 100644 --- a/alfa-client/apps/alfa-e2e/Jenkinsfile +++ b/alfa-client/apps/alfa-e2e/Jenkinsfile @@ -115,24 +115,24 @@ pipeline { script { FAILED_STAGE = env.STAGE_NAME - catchError { - timeout(time: 5, unit: 'MINUTES') { - userVersions = input message: "Edit Default Values", - parameters: [ - string(name: "AlfaImageTag", defaultValue: env.ALFA_IMAGE_TAG, trim: true), - string(name: "AlfaHelmChartVersion", defaultValue: env.ALFA_HELM_CHART_VERSION, trim: true), - string(name: "AlfaHelmRepoUrl", defaultValue: env.ALFA_HELM_REPO_URL, trim: true), - string(name: "VorgangManagerImageTag", defaultValue: env.VORGANG_MANAGER_IMAGE_TAG, trim: true), - string(name: "VorgangManagerHelmChartVersion", defaultValue: env.VORGANG_MANAGER_HELM_CHART_VERSION, trim: true), - string(name: "VorgangManagerHelmRepoUrl", defaultValue: env.VORGANG_MANAGER_HELM_REPO_URL, trim: true), - string(name: "UserManagerImageTag", defaultValue: env.USER_MANAGER_IMAGE_TAG, trim: true), - string(name: "UserManagerHelmChartVersion", defaultValue: env.USER_MANAGER_HELM_CHART_VERSION, trim: true), - string(name: "UserManagerHelmRepoUrl", defaultValue: env.USER_MANAGER_HELM_REPO_URL, trim: true) - ] - - initEnvUserVersions(userVersions) - } - } + // catchError { + // timeout(time: 5, unit: 'MINUTES') { + // userVersions = input message: "Edit Default Values", + // parameters: [ + // string(name: "AlfaImageTag", defaultValue: env.ALFA_IMAGE_TAG, trim: true), + // string(name: "AlfaHelmChartVersion", defaultValue: env.ALFA_HELM_CHART_VERSION, trim: true), + // string(name: "AlfaHelmRepoUrl", defaultValue: env.ALFA_HELM_REPO_URL, trim: true), + // string(name: "VorgangManagerImageTag", defaultValue: env.VORGANG_MANAGER_IMAGE_TAG, trim: true), + // string(name: "VorgangManagerHelmChartVersion", defaultValue: env.VORGANG_MANAGER_HELM_CHART_VERSION, trim: true), + // string(name: "VorgangManagerHelmRepoUrl", defaultValue: env.VORGANG_MANAGER_HELM_REPO_URL, trim: true), + // string(name: "UserManagerImageTag", defaultValue: env.USER_MANAGER_IMAGE_TAG, trim: true), + // string(name: "UserManagerHelmChartVersion", defaultValue: env.USER_MANAGER_HELM_CHART_VERSION, trim: true), + // string(name: "UserManagerHelmRepoUrl", defaultValue: env.USER_MANAGER_HELM_REPO_URL, trim: true) + // ] + + // initEnvUserVersions(userVersions) + // } + // } } } } @@ -163,14 +163,14 @@ pipeline { script { FAILED_STAGE = env.STAGE_NAME - checkoutGitopsE2eBranch() + // checkoutGitopsE2eBranch() - deleteOzgCloudStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER]) + // deleteOzgCloudStack([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER]) - generateMainNamespaceYaml() - generateEaNamespaceYaml() + // generateMainNamespaceYaml() + // generateEaNamespaceYaml() - pushGitopsRepo() + // pushGitopsRepo() } } post { @@ -211,7 +211,7 @@ pipeline { script { FAILED_STAGE = env.STAGE_NAME - waitForOzgCloudStackRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER]) + // waitForOzgCloudStackRollout([env.EA_BEZEICHNER, env.MAIN_BEZEICHNER]) } } post { @@ -630,7 +630,8 @@ String runTests(String bezeichner, String reportFolder, Integer dbPort, String s try { dir('alfa-client'){ sh "npm run cypress:version" - sh "apps/alfa-e2e/run-tests.sh ${reportFolder} ${config}" + sh "npx cypress run --project apps/alfa-e2e --spec apps/alfa-e2e/src/e2e/smocker-test --config-file cypress-ci-main-tests.config.ts" + // sh "apps/alfa-e2e/run-tests.sh ${reportFolder} ${config}" } } catch (Exception e) { printNpmDebugLog() @@ -669,7 +670,7 @@ String cutBranchNameForKeycloakRealm(String branchName, String stageName) { String generateCypressConfig(String bezeichner, String testFolder, Integer dbPort) { def namespace = generateNamespace(bezeichner) - def configName = "cypress-ci-"+testFolder+".json" + def configName = "cypress-ci-main-tests.json" dir('alfa-client/apps/alfa-e2e/'){ def config = readJSON file: 'cypress-ci.json' @@ -837,6 +838,6 @@ Boolean hasNpmDebugLog() { Map getSmockerEnv(String namespace) { return [ - "url": "https://${namespace}-smocker.dev.by.ozg-cloud.de" + "url": "https://${namespace}-smocker.dev.by.ozg-cloud.de".toString() ] } \ No newline at end of file