Skip to content
Snippets Groups Projects
Commit 5b16cf52 authored by OZG-Cloud Team's avatar OZG-Cloud Team
Browse files

OZG-3140 check before git commit

parent ac64f870
No related branches found
No related tags found
No related merge requests found
...@@ -241,11 +241,6 @@ String getElementAccessToken() { ...@@ -241,11 +241,6 @@ String getElementAccessToken() {
Void setNewProvisioningVersion(String environment) { 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.afm_adapter.image.tag = IMAGE_TAG envVersions.versions.afm_adapter.image.tag = IMAGE_TAG
...@@ -258,14 +253,14 @@ Void setNewProvisioningVersion(String environment) { ...@@ -258,14 +253,14 @@ Void setNewProvisioningVersion(String environment) {
} }
Void pushNewProvisioningVersion(String environment) { Void pushNewProvisioningVersion(String environment) {
withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) { dir('provisioning') {
dir('provisioning') { if (sh (script: "git status | grep '/versions'", returnStatus: true) == 1) {
if (env.BRANCH_NAME == 'release') { return
sh 'git add playbook/inventory/versions/.' }
}
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} afm-adapter fs-adapter version ${IMAGE_TAG}'" sh "git commit -m 'jenkins rollout ${environment} afm-adapter fs-adapter version ${IMAGE_TAG}'"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment