From 2f5672015725d414cff8602970a3f3dd04df7b70 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 25 Nov 2022 09:54:28 +0100
Subject: [PATCH] OZG-3140 check before git commit
---
Jenkinsfile | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 6b8510a7..16531789 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -251,10 +251,6 @@ Void setNewProvisioningVersion(String environment) {
dir("provisioning") {
def envFile = "inventories/group_vars/${environment}/versions"
- if (env.BRANCH_NAME == 'release') {
- envFile = "playbook/inventory/versions/${environment}.yml"
- }
-
def envVersions = readYaml file: envFile
envVersions.versions.user_manager.image.tag = IMAGE_TAG
@@ -277,14 +273,14 @@ Void checkoutProvisioningRepo() {
}
Void pushNewProvisioningVersion(String environment) {
- withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) {
- dir('provisioning') {
- if (env.BRANCH_NAME == 'release') {
- sh 'git add playbook/inventory/versions/.'
- }
- else {
- sh 'git add inventories/group_vars/*/versions'
- }
+ dir('provisioning') {
+ if (sh (script: "git status | grep 'inventories/group_vars/.*/versions'", returnStatus: true) == 1) {
+ return
+ }
+
+ withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) {
+ sh 'git add inventories/group_vars/*/versions'
+
sh 'git config user.email "jenkins@ozg.de"'
sh 'git config user.name "jenkins"'
sh "git commit -m 'jenkins rollout ${environment} user-manager version ${IMAGE_TAG}'"
--
GitLab