fixed the for loop (#736)

fixed the for loop
redhat-performance · Feb 27, 2024 · 11967ff · 11967ff
1 parent 3af340f
commit 11967ff
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 34 deletions.
diff --git a/jenkins/clouds/aws/daily/policies/Jenkinsfile b/jenkins/clouds/aws/daily/policies/Jenkinsfile
@@ -1,4 +1,4 @@
-account = ['perf-dept' : "", 'perfscale': "", 'psap': ""]
+accounts_list = ['perf-dept' : "", 'perfscale': "", 'psap': ""]
 pipeline {
     options {
         disableConcurrentBuilds()
@@ -43,12 +43,12 @@ pipeline {
         stage('Run Daily Policies') {
             steps {
                  script {
-                    for (int i = 0; i < account.size(); ++i) {
-                        echo "Running for account ${account[i].toUpperCase()}"
-                        withCredentials([string(credentialsId: "${account[i]}-aws-access-key-id", variable: 'access_key'),
-                                        string(credentialsId: "${account[i]}-aws-secret-key-id", variable: 'secret_key'),
-                                        string(credentialsId: "${account[i]}-s3-bucket", variable: 's3_bucket')]) {
-                            env.account_name = "${account[i]}"
+                    for (account in accounts_list.keySet() {
+                        echo "Running for account ${account.toUpperCase()}"
+                        withCredentials([string(credentialsId: "${account}-aws-access-key-id", variable: 'access_key'),
+                                        string(credentialsId: "${account}-aws-secret-key-id", variable: 'secret_key'),
+                                        string(credentialsId: "${account}-s3-bucket", variable: 's3_bucket')]) {
+                            env.account_name = "${account}"
                             env.ADMIN_MAIL_LIST = "${accounts_list[account]}"
                             sh 'python3 jenkins/clouds/aws/daily/policies/run_policies.py'
                         }

diff --git a/jenkins/clouds/aws/daily/policies/azure_policies.py b/jenkins/clouds/aws/daily/policies/azure_policies.py
diff --git a/jenkins/tenant/aws/ecoeng_02/PolicyJenkinsfileDaily b/jenkins/tenant/aws/ecoeng_02/PolicyJenkinsfileDaily
@@ -41,12 +41,12 @@ pipeline {
         stage('Run Cost Policies') {
             steps {
                  script {
-                    for (int i = 0; i < account.size(); ++i) {
-                        echo "Running for account ${account[i].toUpperCase()}"
-                        withCredentials([string(credentialsId: "${account[i]}-aws-access-key-id", variable: 'access_key'),
-                                        string(credentialsId: "${account[i]}-aws-secret-key-id", variable: 'secret_key'),
-                                        string(credentialsId: "${account[i]}-s3-bucket", variable: 's3_bucket')]) {
-                        env.account_name = "${account[i]}"
+                    for (account in accounts_list.keySet()) {
+                        echo "Running for account ${account.toUpperCase()}"
+                        withCredentials([string(credentialsId: "${account}-aws-access-key-id", variable: 'access_key'),
+                                        string(credentialsId: "${account}-aws-secret-key-id", variable: 'secret_key'),
+                                        string(credentialsId: "${account}-s3-bucket", variable: 's3_bucket')]) {
+                        env.account_name = "${account}"
                         sh 'python3 jenkins/tenant/aws/common/run_cost_policies.py'
                                         }
                     }
@@ -56,12 +56,12 @@ pipeline {
         stage('Run Daily Policies') {
             steps {
                  script {
-                    for (int i = 0; i < account.size(); ++i) {
-                        echo "Running for account ${account[i].toUpperCase()}"
-                        withCredentials([string(credentialsId: "${account[i]}-aws-access-key-id", variable: 'access_key'),
-                                        string(credentialsId: "${account[i]}-aws-secret-key-id", variable: 'secret_key'),
-                                        string(credentialsId: "${account[i]}-s3-bucket", variable: 's3_bucket')]) {
-                        env.account_name = "${account[i]}"
+                    for (account in accounts_list.keySet()) {
+                        echo "Running for account ${account.toUpperCase()}"
+                        withCredentials([string(credentialsId: "${account}-aws-access-key-id", variable: 'access_key'),
+                                        string(credentialsId: "${account}-aws-secret-key-id", variable: 'secret_key'),
+                                        string(credentialsId: "${account}-s3-bucket", variable: 's3_bucket')]) {
+                        env.account_name = "${account}"
                         env.ADMIN_MAIL_LIST = "${accounts_list[account]}"
                         sh 'python3 jenkins/tenant/aws/common/run_policies.py'
                                         }

diff --git a/jenkins/tenant/aws/ecoeng_03/PolicyJenkinsfileDaily b/jenkins/tenant/aws/ecoeng_03/PolicyJenkinsfileDaily
@@ -1,4 +1,4 @@
-account = ['coreos-training': "[email protected], [email protected]",
+accounts_list = ['coreos-training': "[email protected], [email protected]",
            'industry-partners': "",
            'special-projects': "",
            'edgeinfra': "",
@@ -46,12 +46,12 @@ pipeline {
         stage('Run Cost Policies') {
             steps {
                  script {
-                    for (int i = 0; i < account.size(); ++i) {
-                        echo "Running for account ${account[i].toUpperCase()}"
-                        withCredentials([string(credentialsId: "${account[i]}-aws-access-key-id", variable: 'access_key'),
-                                        string(credentialsId: "${account[i]}-aws-secret-key-id", variable: 'secret_key'),
-                                        string(credentialsId: "${account[i]}-s3-bucket", variable: 's3_bucket')]) {
-                        env.account_name = "${account[i]}"
+                    for (account in accounts_list.keySet() ) {
+                        echo "Running for account ${account.toUpperCase()}"
+                        withCredentials([string(credentialsId: "${account}-aws-access-key-id", variable: 'access_key'),
+                                        string(credentialsId: "${account}-aws-secret-key-id", variable: 'secret_key'),
+                                        string(credentialsId: "${account}-s3-bucket", variable: 's3_bucket')]) {
+                        env.account_name = "${account}"
                         sh 'python3 jenkins/tenant/aws/common/run_cost_policies.py'
                                         }
                     }
@@ -61,12 +61,12 @@ pipeline {
         stage('Run Daily Policies') {
             steps {
                  script {
-                    for (int i = 0; i < account.size(); ++i) {
-                        echo "Running for account ${account[i].toUpperCase()}"
-                        withCredentials([string(credentialsId: "${account[i]}-aws-access-key-id", variable: 'access_key'),
-                                        string(credentialsId: "${account[i]}-aws-secret-key-id", variable: 'secret_key'),
-                                        string(credentialsId: "${account[i]}-s3-bucket", variable: 's3_bucket')]) {
-                        env.account_name = "${account[i]}"
+                    for (account in accounts_list.keySet()) {
+                        echo "Running for account ${account.toUpperCase()}"
+                        withCredentials([string(credentialsId: "${account}-aws-access-key-id", variable: 'access_key'),
+                                        string(credentialsId: "${account}-aws-secret-key-id", variable: 'secret_key'),
+                                        string(credentialsId: "${account}-s3-bucket", variable: 's3_bucket')]) {
+                        env.account_name = "${account}"
                         env.ADMIN_MAIL_LIST = "${accounts_list[account]}"
                         sh 'python3 jenkins/tenant/aws/common/run_policies.py'
                                         }