diff --git a/Jenkinsfile b/Jenkinsfile index 99990bef287fa0bea1d1e421cc629fb9d51a0005..4b85c1d04a2e844fa5421f4d7f564bf5f1bcf301 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -214,7 +214,12 @@ String getElementAccessToken() { Void setNewProvisioningVersion(String environment) { dir("provisioning") { - def envFile = "playbook/inventory/versions/${environment}.yml" + 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 @@ -238,7 +243,12 @@ Void checkoutProvisioningRepo() { Void pushNewProvisioningVersion(String environment) { withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) { dir('provisioning') { - sh 'git add playbook/inventory/versions/.' + if (env.BRANCH_NAME == 'release') { + sh 'git add playbook/inventory/versions/.' + } + else { + 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}'"