diff --git a/Jenkinsfile b/Jenkinsfile index 6b8510a79431753fe9c46cefc39df0c4212bd8a1..16531789553f6a3e5dc78e687a691ec1307c5c7f 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}'"