From 52843348320ad7f8899985b3c8c6e55f4000e6d5 Mon Sep 17 00:00:00 2001
From: Stefan Hauffe <stefan.hauffe@mgm-tp.com>
Date: Wed, 18 Dec 2024 17:47:59 +0100
Subject: [PATCH] OZG-7324: Restructured Jenkinsfiles
---
.../apps/admin/Jenkinsfile | 0
alfa-client/apps/alfa/Jenkinsfile | 2 +-
alfa-client/apps/info/Jenkinsfile | 18 +++++++++---------
3 files changed, 10 insertions(+), 10 deletions(-)
rename Jenkinsfile.admin => alfa-client/apps/admin/Jenkinsfile (100%)
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 3542de4c2a..459a8ee482 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 229598a177..9d859c2087 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) {
--
GitLab