diff --git a/Jenkinsfile b/Jenkinsfile index af6fbccf364ea343309b20ca02ce02e776abc1db..4e6814c8366ecb88c8e92b6b45152bc14ebef4fe 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 '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} afm-adapter fs-adapter version ${IMAGE_TAG}'"