diff --git a/Jenkinsfile b/Jenkinsfile index 0e966522203880bcc8d4ac1d3c6072d2a5bf2be9..0a5f73bb61823ed177c3685b8dbd252a54d8f864 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -343,8 +343,10 @@ Void checkoutProvisioningRepo(String stage) { dir(stage) { sh 'git clone https://${USER}:${TOKEN}@git.ozg-sh.de/mgm/provisioning.git' - dir('provisioning') { - sh 'git checkout feature/refactoring' + if (env.BRANCH_NAME == 'release') { + dir('provisioning') { + sh 'git checkout release' + } } } } @@ -352,13 +354,12 @@ Void checkoutProvisioningRepo(String stage) { Void copyTestEnvironmentToDev(stage) { dir("${stage}/provisioning") { + def devEnvFile = "inventories/group_vars/dev/versions" + def testEnvFile = "inventories/group_vars/test/versions" + if (env.BRANCH_NAME == 'release') { - def devEnvFile = "playbook/inventory/versions/dev.yml" - def testEnvFile = "playbook/inventory/versions/test.yml" - } - else { - def devEnvFile = "inventory/group_vars/dev/versions" - def testEnvFile = "inventory/group_vars/test/versions" + devEnvFile = "playbook/inventory/versions/dev.yml" + testEnvFile = "playbook/inventory/versions/test.yml" } def devVersions = readYaml file: devEnvFile @@ -373,11 +374,10 @@ Void copyTestEnvironmentToDev(stage) { Void editEnvironemntVersion(String stage, String imageTag, Boolean isEa) { dir("${stage}/provisioning") { + def editFile = "inventories/group_vars/dev/versions" + if (env.BRANCH_NAME == 'release') { - def editFile = "playbook/inventory/versions/dev.yml" - } - else { - def editFile = "inventory/group_vars/dev/versions" + editFile = "playbook/inventory/versions/dev.yml" } def devVersions = readYaml file: editFile @@ -403,11 +403,10 @@ String getSpringProfile(Boolean isEa) { Void setupEaEnvironment(String stage) { dir("${stage}/provisioning") { + def editFile = "inventories/group_vars/all/env" + if (env.BRANCH_NAME == 'release') { - def editFile = "playbook/inventory/group_vars/all.yml" - } - else { - def editFile = "inventory/group_vars/all/env" + editFile = "playbook/inventory/group_vars/all.yml" } def groupVars = readYaml file: editFile @@ -420,11 +419,10 @@ Void setupEaEnvironment(String stage) { Void setPlutoDatabasePassword(String stage) { dir("${stage}/provisioning") { + def editFile = "inventories/group_vars/dev/versions" + if (env.BRANCH_NAME == 'release') { - def editFile = "playbook/inventory/versions/dev.yml" - } - else { - def editFile = "inventory/group_vars/dev/versions" + editFile = "playbook/inventory/versions/dev.yml" } def devVars = readYaml file: editFile