Skip to content
Snippets Groups Projects
Commit bf5f51f8 authored by OZGCloud's avatar OZGCloud
Browse files

Merge pull request 'OZG-3140 check before git commit' (#23) from...

Merge pull request 'OZG-3140 check before git commit' (#23) from OZG-3140-git-push-check into master

Reviewed-on: https://git.ozg-sh.de/mgm/user-manager/pulls/23
parents ee5a0c7d 2f567201
No related branches found
No related tags found
No related merge requests found
...@@ -251,10 +251,6 @@ Void setNewProvisioningVersion(String environment) { ...@@ -251,10 +251,6 @@ Void setNewProvisioningVersion(String environment) {
dir("provisioning") { dir("provisioning") {
def envFile = "inventories/group_vars/${environment}/versions" def envFile = "inventories/group_vars/${environment}/versions"
if (env.BRANCH_NAME == 'release') {
envFile = "playbook/inventory/versions/${environment}.yml"
}
def envVersions = readYaml file: envFile def envVersions = readYaml file: envFile
envVersions.versions.user_manager.image.tag = IMAGE_TAG envVersions.versions.user_manager.image.tag = IMAGE_TAG
...@@ -277,14 +273,14 @@ Void checkoutProvisioningRepo() { ...@@ -277,14 +273,14 @@ Void checkoutProvisioningRepo() {
} }
Void pushNewProvisioningVersion(String environment) { Void pushNewProvisioningVersion(String environment) {
withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) {
dir('provisioning') { dir('provisioning') {
if (env.BRANCH_NAME == 'release') { if (sh (script: "git status | grep 'inventories/group_vars/.*/versions'", returnStatus: true) == 1) {
sh 'git add playbook/inventory/versions/.' return
} }
else {
withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) {
sh 'git add inventories/group_vars/*/versions' sh 'git add inventories/group_vars/*/versions'
}
sh 'git config user.email "jenkins@ozg.de"' sh 'git config user.email "jenkins@ozg.de"'
sh 'git config user.name "jenkins"' sh 'git config user.name "jenkins"'
sh "git commit -m 'jenkins rollout ${environment} user-manager version ${IMAGE_TAG}'" sh "git commit -m 'jenkins rollout ${environment} user-manager version ${IMAGE_TAG}'"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment