From 7103272b5f2af8db2daeaab4b966453851705e25 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 24 Nov 2022 18:24:10 +0100
Subject: [PATCH] OZG-3140 check before git commit
---
Jenkinsfile | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index af6fbccf3..da4fc7d7a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -241,11 +241,6 @@ String getElementAccessToken() {
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.afm_adapter.image.tag = IMAGE_TAG
@@ -258,14 +253,14 @@ Void setNewProvisioningVersion(String environment) {
}
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 '/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} afm-adapter fs-adapter version ${IMAGE_TAG}'"
--
GitLab