diff --git a/Jenkinsfile b/Jenkinsfile index b92404fdc6980aeda653a7b5422c028265fba003..21bc03237a50528cd0b55166b8b8fdfbd15668c9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { } environment { - BLUE_OCEAN_URL = "https://jenkins.ozg-sh.de/blue/organizations/jenkins/goofy/detail/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/pipeline" + BLUE_OCEAN_URL = "https://jenkins.ozg-sh.de/job/goofy/job/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/" RELEASE_REGEX = /\d+.\d+.\d+/ SNAPSHOT_REGEX = /\d+.\d+.\d+-SNAPSHOT/ FAILED_STAGE = "" @@ -116,11 +116,11 @@ pipeline { } } } - post { - always{ - junit testResults: '**/target/surefire-reports/*.xml', skipPublishingChecks: true - } - } + post { + always{ + junit testResults: '**/target/surefire-reports/*.xml', skipPublishingChecks: true + } + } } stage('Init k8s') { steps { @@ -658,7 +658,7 @@ String generateCypressConfig(String stage, String bezeichner, String testFolder, def namespace = "${bundesland}-${bezeichner}-dev" def configName = "cypress-ci-"+testFolder+".json" - def url = ".dev.ozg-sh.de" + def url = "dev.ozg-sh.de" dir('goofy-client/apps/goofy-e2e/'){ def config = readJSON file: 'cypress-ci.json' @@ -770,7 +770,7 @@ String getElasticsearchEnv(namespace) { "user":"${decodeString(elasticsearchSecret.username)}", \ "password":"${decodeString(elasticsearchSecret.password)}", \ "index":"${decodeString(elasticsearchSecret.index)}", \ - "url":"http://localhost:9200"}""" + "url":"https://localhost:9200"}""" return readJSON ( text: env) }