diff --git a/Jenkinsfile b/Jenkinsfile index cd73182f1f5fa5d4ebff8f5c742d1d5d28ba81f8..1043f508790123449723158c165010dac2c64cb7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -156,11 +156,11 @@ pipeline { script { FAILED_STAGE = env.STAGE_NAME - checkoutProvisioningRepo() + checkoutGitopsRepo() - setNewProvisioningVersion('dev') + setNewGitopsVersion('dev') - pushNewProvisioningVersion('dev') + pushNewGitopsVersion('dev') } } } @@ -174,12 +174,11 @@ pipeline { script { FAILED_STAGE = env.STAGE_NAME - checkoutProvisioningRepo() + checkoutGitopsRepo() - setNewProvisioningVersion('test') - setNewProvisioningVersion('stage') + setNewGitopsVersion('test') - pushNewProvisioningVersion('test stage') + pushNewGitopsVersion('test') } } } @@ -247,44 +246,38 @@ String getElementAccessToken() { } } -Void setNewProvisioningVersion(String environment) { - dir("provisioning") { - def envFile = "inventories/group_vars/${environment}/versions" +Void setNewGitopsVersion(String environment) { + dir("gitops") { + def envFile = "${environment}/application/values/user-manager-values.yaml" def envVersions = readYaml file: envFile - envVersions.versions.user_manager.image.tag = IMAGE_TAG - envVersions.charts.user_manager.version = HELM_CHART_VERSION + envVersions.user_manager.image.tag = IMAGE_TAG + envVersions.user_manager.helm.version = HELM_CHART_VERSION writeYaml file: envFile, data: envVersions, overwrite: true } } -Void checkoutProvisioningRepo() { +Void checkoutGitopsRepo() { withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) { - sh 'git clone https://${USER}:${TOKEN}@git.ozg-sh.de/mgm/provisioning.git' - - if (env.BRANCH_NAME == 'release') { - dir('provisioning') { - sh 'git checkout release' - } - } + sh 'git clone https://${USER}:${TOKEN}@git.ozg-sh.de/mgm/gitops.git' } } -Void pushNewProvisioningVersion(String environment) { - dir('provisioning') { - if (sh (script: "git status | grep 'inventories/group_vars/.*/versions'", returnStatus: true) == 1) { +Void pushNewGitopsVersion(String environment) { + dir('gitops') { + if (sh (script: "git status | grep '${environment}/application/values/user-manager-values.yaml'", returnStatus: true) == 1) { return } withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) { - sh 'git add inventories/group_vars/*/versions' + sh "git add ${environment}/application/values/user-manager-values.yaml" - sh 'git config user.email "jenkins@ozg.de"' + sh 'git config user.email "jenkins@ozg-sh.de"' sh 'git config user.name "jenkins"' sh "git commit -m 'jenkins rollout ${environment} user-manager version ${IMAGE_TAG}'" - sh 'git push https://${USER}:${TOKEN}@git.ozg-sh.de/mgm/provisioning.git' + sh 'git push https://${USER}:${TOKEN}@git.ozg-sh.de/mgm/gitops.git' } } }