Merge pull request #1713 from edx/ihassan/GSRE-997_update_dead_lock_job

chore: Update check dead lock job to run for whitelisted regions
edx · Dec 12, 2023 · 4ad2e30 · 4ad2e30
2 parents 245c19e + caaea74
commit 4ad2e30
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/devops/jobs/ExportRDSDeadLocks.groovy b/devops/jobs/ExportRDSDeadLocks.groovy
@@ -40,13 +40,19 @@ class ExportRDSDeadLocks {
                         rdsignore = "${rdsignore}-i ${ignore} "
                     }
 
+                    def whitelistregions = ""
+                    configuration.REGION_LIST.each { include ->
+                        whitelistregions = "${whitelistregions}-r ${include} "
+                    }
+
                     environmentVariables {
                         env('AWS_DEFAULT_REGION', extraVars.get('REGION'))
                         env('ENVIRONMENT', environment)
                         env('HOSTNAME', extraVars.get('SPLUNKHOSTNAME'))
                         env('PORT', extraVars.get('PORT'))
                         env('INDEXNAME', INDEXNAME)
                         env('RDSIGNORE', rdsignore)
+                        env('WHITELISTREGIONS', whitelistregions)
                     }
 
                     multiscm {

diff --git a/devops/jobs/ListMysqlProcess.groovy b/devops/jobs/ListMysqlProcess.groovy
@@ -37,16 +37,16 @@ class ListMysqlProcess {
                         rdsignore = "${rdsignore}-i ${ignore} "
                     }
 
-                    def regioninclude = ""
+                    def whitelistregions = ""
                     configuration.REGION_LIST.each { include ->
-                        regioninclude = "${regioninclude}-r ${include} "
+                        whitelistregions = "${whitelistregions}-r ${include} "
                     }
 
                     environmentVariables {
                         env('AWS_DEFAULT_REGION', extraVars.get('REGION'))
                         env('ENVIRONMENT', environment)
                         env('RDSIGNORE', rdsignore)
-                        env('REGIONINCLUDE', regioninclude)
+                        env('WHITELISTREGIONS', whitelistregions)
                     }
 
                     multiscm {

diff --git a/devops/resources/export-dead-locks.sh b/devops/resources/export-dead-locks.sh
@@ -22,5 +22,8 @@ set -x
 if [[ ! -v RDSIGNORE ]]; then
     RDSIGNORE=""
 fi
+if [[ ! -v WHITELISTREGIONS ]]; then
+    WHITELISTREGIONS=""
+fi
 
-python export_dead_locks.py --environment ${ENVIRONMENT} --hostname ${HOSTNAME} --port ${PORT} --indexname ${INDEXNAME} ${RDSIGNORE}
+python export_dead_locks.py --environment ${ENVIRONMENT} --hostname ${HOSTNAME} --port ${PORT} --indexname ${INDEXNAME} ${RDSIGNORE} ${WHITELISTREGIONS}
diff --git a/devops/resources/list-mysql-process.sh b/devops/resources/list-mysql-process.sh
@@ -22,8 +22,8 @@ set -x
 if [[ ! -v RDSIGNORE ]]; then
     RDSIGNORE=""
 fi
-if [[ ! -v REGIONINCLUDE ]]; then
-    REGIONINCLUDE=""
+if [[ ! -v WHITELISTREGIONS ]]; then
+    WHITELISTREGIONS=""
 fi
 
-python list_mysql_process.py --environment ${ENVIRONMENT} ${RDSIGNORE} ${REGIONINCLUDE}
+python list_mysql_process.py --environment ${ENVIRONMENT} ${RDSIGNORE} ${WHITELISTREGIONS}