Skip to content

Commit 599deb4

Browse files
committed
Automation Toolkit Release v2024.2.2
1 parent 69941c7 commit 599deb4

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

jenkins_install/tf-apply.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ pipeline {
6060
env.Service = serviceName
6161
}
6262

63-
def final_path = "${WORKSPACE}/${env.Region}/${env.Service}"
6463
sh "cd \"${WORKSPACE}/${env.Region}/${env.Service}\" && terraform init -upgrade"
6564
// Run Terraform plan and capture the output
6665
terraformPlanOutput = sh(script: "cd \"${WORKSPACE}/${env.Region}/${env.Service}\" && terraform plan -out=tfplan.out", returnStdout: true).trim()

jenkins_install/tf-destroy.groovy

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,21 @@ pipeline {
4949
env.Region = regionName
5050
env.Service = serviceName
5151

52-
sh "cd \"${WORKSPACE}/${env.Region}/${env.Service}\" && terraform init -upgrade"
53-
//sh "cd \"${WORKSPACE}/${env.Region}/${env.Service}\" && terraform plan -destroy"
54-
55-
// Run Terraform plan
56-
terraformPlanOutput = sh(script: "cd \"${WORKSPACE}/${env.Region}/${env.Service}\" && terraform plan -destroy", returnStdout: true).trim()
57-
} else {
52+
} else {
5853
// Assuming job name format is <region_name>/job/job_name
5954
def regionName = parts[1]
55+
def serviceName = ''
56+
if (regionName == 'global') {
57+
serviceName = 'rpc'
58+
}
6059
// Set environment variables for reuse
6160
env.Region = regionName
61+
env.Service = serviceName
6262

63-
sh "cd \"${WORKSPACE}/${env.Region}\" && terraform init -upgrade"
64-
65-
// Run Terraform plan
66-
terraformPlanOutput = sh(script: "cd \"${WORKSPACE}/${env.Region}\" && terraform plan -destroy", returnStdout: true).trim()
67-
}
63+
}
64+
sh "cd \"${WORKSPACE}/${env.Region}\" && terraform init -upgrade"
65+
// Run Terraform plan
66+
terraformPlanOutput = sh(script: "cd \"${WORKSPACE}/${env.Region}\" && terraform plan -destroy", returnStdout: true).trim()
6867

6968
// Check if the plan contains any changes
7069
if (terraformPlanOutput.contains('No changes.')) {

0 commit comments

Comments
 (0)