From d88195e36d50f0f7f6a7905f1d74c003cce7d4ef Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Tue, 13 Jun 2023 12:20:04 +0200 Subject: [PATCH] fix naming jenkinsfile --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index dfa70a3..56114f5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -133,7 +133,7 @@ pipeline { cloneGitopsRepo() - setNewDevAdapterVersion() + setNewDevVersion() pushNewDevVersion() } @@ -224,11 +224,11 @@ String getElementAccessToken() { } } -Void setNewDevAdapterVersion() { +Void setNewDevVersion() { setNewOzgOperatorVersion('dev') } -Void setNewTestAdapterVersion() { +Void setNewTestVersion() { setNewOzgOperatorVersion('test') } @@ -254,20 +254,20 @@ Void pushNewTestVersion() { Void pushNewGitopsVersion(String environment) { dir('gitops') { - if (!hasAdapterValuesFileChanged(environment)) { + if (!hasValuesFileChanged(environment)) { return } withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) { sh "git add ${environment}/application/values/ozg-operator-values.yaml" - sh "git commit -m 'jenkins rollout ${environment} afm-adapter fs-adapter version ${IMAGE_TAG}'" + sh "git commit -m 'jenkins rollout ${environment} ozg-operator version ${IMAGE_TAG}'" sh 'git push https://${USER}:${TOKEN}@git.ozg-sh.de/mgm/gitops.git' } } } -Boolean hasAdapterValuesFileChanged(String environment) { +Boolean hasValuesFileChanged(String environment) { return sh (script: "git status | grep '${environment}/application/values/ozg-operator-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer } -- GitLab