diff --git a/Jenkinsfile.admin b/alfa-client/apps/admin/Jenkinsfile similarity index 100% rename from Jenkinsfile.admin rename to alfa-client/apps/admin/Jenkinsfile diff --git a/alfa-client/apps/alfa/Jenkinsfile b/alfa-client/apps/alfa/Jenkinsfile index 3542de4c2a9ff856ac1bf78f457f3726e9c91c25..459a8ee482654c7a43d38c1cfb1436d445c9d0c2 100644 --- a/alfa-client/apps/alfa/Jenkinsfile +++ b/alfa-client/apps/alfa/Jenkinsfile @@ -29,7 +29,7 @@ pipeline { } environment { - BLUE_OCEAN_URL = "https://jenkins.infra.ozg-cloud.systems/job/codeSH_frontendclients/job/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/" + BLUE_OCEAN_URL = "https://jenkins.infra.ozg-cloud.systems/job/codeSH_alfa-client/job/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/" RELEASE_REGEX = /\d+.\d+.\d+/ SNAPSHOT_REGEX = /\d+.\d+.\d+-SNAPSHOT/ FAILED_STAGE = "" diff --git a/alfa-client/apps/info/Jenkinsfile b/alfa-client/apps/info/Jenkinsfile index 229598a17788d64294d7911a2fd10dacbc88d92c..9d859c208764e6c0099f07351b89fcdff3f93434 100644 --- a/alfa-client/apps/info/Jenkinsfile +++ b/alfa-client/apps/info/Jenkinsfile @@ -5,7 +5,7 @@ pipeline { } } environment { - BLUE_OCEAN_URL = "https://jenkins.infra.ozg-cloud.systems/job/info/job/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/" + BLUE_OCEAN_URL = "https://jenkins.infra.ozg-cloud.systems/job/codeSH_info-client/job/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/" RELEASE_REGEX = /\d+.\d+.\d+/ SNAPSHOT_REGEX = /\d+.\d+.\d+-SNAPSHOT/ FAILED_STAGE = "" @@ -25,7 +25,7 @@ pipeline { script { FAILED_STAGE = env.STAGE_NAME dir('alfa-client') { - VERSION = getPackagejsonVersion() + VERSION = getInfoPackageJsonVersion() } } } @@ -86,10 +86,10 @@ pipeline { script { FAILED_STAGE = env.STAGE_NAME HELM_CHART_VERSION = generateHelmChartVersion() - + dir('alfa-client/apps/info') { sh "./run_helm_test.sh" - + dir('src/main/helm') { sh "helm package --version=${HELM_CHART_VERSION} ." @@ -235,11 +235,11 @@ Void loginToDockerRegistry(){ sh 'docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}' } } -String getPackagejsonVersion() { - def packageJSON = readJSON file: 'package.json' - def packageJSONVersion = packageJSON.version - echo packageJSONVersion - return packageJSONVersion +String getInfoPackageJsonVersion() { + def packageJSON = readJSON file: 'alfa-client/apps/info/package.json' + def packageJSONVersion = packageJSON.version + echo packageJSONVersion + return packageJSONVersion } Void deployHelmChart(String helmChartVersion) {