From 9cf45bc9458b19b42043387f6298d1dc2cb7bea4 Mon Sep 17 00:00:00 2001
From: Tanner Lewis <lewijacn@amazon.com>
Date: Tue, 3 Sep 2024 10:10:45 -0500
Subject: [PATCH] Updates for test account id

Signed-off-by: Tanner Lewis <lewijacn@amazon.com>
---
 .../rfsBackfillE2EPipeline.groovy                     | 11 +++++++----
 vars/defaultIntegPipeline.groovy                      |  8 ++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/jenkins/migrationIntegPipelines/rfsBackfillE2EPipeline.groovy b/jenkins/migrationIntegPipelines/rfsBackfillE2EPipeline.groovy
index e04038a73..b620412cd 100644
--- a/jenkins/migrationIntegPipelines/rfsBackfillE2EPipeline.groovy
+++ b/jenkins/migrationIntegPipelines/rfsBackfillE2EPipeline.groovy
@@ -40,7 +40,6 @@ def migration_cdk_context = """
         "openAccessPolicyEnabled": true,
         "domainRemovalPolicy": "DESTROY",
         "artifactBucketRemovalPolicy": "DESTROY",
-        "kafkaBrokerServiceEnabled": true,
         "trafficReplayerServiceEnabled": false,
         "reindexFromSnapshotServiceEnabled": true,
         "sourceClusterEndpoint": "<SOURCE_CLUSTER_ENDPOINT>"
@@ -68,8 +67,12 @@ defaultIntegPipeline(
                     "--junitxml=${test_result_file} ${test_dir}/backfill_tests.py " +
                     "--unique_id ${uniqueId} " +
                     "-s"
-            sh "sudo --preserve-env ./awsRunIntegTests.sh --command '${command}' " +
-                    "--test-result-file ${test_result_file} " +
-                    "--stage ${params.STAGE}"
+            withCredentials([string(credentialsId: 'migration-test-account-id', variable: 'MIGRATION_TEST_ACCOUNT_ID')]) {
+                withAWS(role: 'JenkinsDeploymentRole', roleAccount: "${MIGRATION_TEST_ACCOUNT_ID}", duration: 3600, roleSessionName: 'jenkins-session') {
+                    sh "sudo --preserve-env ./awsRunIntegTests.sh --command '${command}' " +
+                            "--test-result-file ${test_result_file} " +
+                            "--stage ${params.STAGE}"
+                }
+            }
         }
 )
diff --git a/vars/defaultIntegPipeline.groovy b/vars/defaultIntegPipeline.groovy
index 3581cbc35..200f29234 100644
--- a/vars/defaultIntegPipeline.groovy
+++ b/vars/defaultIntegPipeline.groovy
@@ -104,8 +104,8 @@ def call(Map config = [:]) {
                                     if (skipCaptureProxyOnNodeSetup) {
                                         baseCommand += " --skip-capture-proxy"
                                     }
-                                    withCredentials([string(credentialsId: 'deployment-account-id', variable: 'DEPLOYMENT_ACCOUNT_ID')]) {
-                                        withAWS(role: 'JenkinsDeploymentRole', roleAccount: "${DEPLOYMENT_ACCOUNT_ID}", duration: 5400, roleSessionName: 'jenkins-session') {
+                                    withCredentials([string(credentialsId: 'migration-test-account-id', variable: 'MIGRATION_TEST_ACCOUNT_ID')]) {
+                                        withAWS(role: 'JenkinsDeploymentRole', roleAccount: "${MIGRATION_TEST_ACCOUNT_ID}", duration: 5400, roleSessionName: 'jenkins-session') {
                                             sh baseCommand
                                         }
                                     }
@@ -133,8 +133,8 @@ def call(Map config = [:]) {
                                             "--junitxml=${test_result_file} ${test_dir}/replayer_tests.py " +
                                             "--unique_id ${uniqueId} " +
                                             "-s"
-                                    withCredentials([string(credentialsId: 'deployment-account-id', variable: 'DEPLOYMENT_ACCOUNT_ID')]) {
-                                        withAWS(role: 'JenkinsDeploymentRole', roleAccount: "${DEPLOYMENT_ACCOUNT_ID}", duration: 3600, roleSessionName: 'jenkins-session') {
+                                    withCredentials([string(credentialsId: 'migration-test-account-id', variable: 'MIGRATION_TEST_ACCOUNT_ID')]) {
+                                        withAWS(role: 'JenkinsDeploymentRole', roleAccount: "${MIGRATION_TEST_ACCOUNT_ID}", duration: 3600, roleSessionName: 'jenkins-session') {
                                             sh "sudo --preserve-env ./awsRunIntegTests.sh --command '${command}' " +
                                                     "--test-result-file ${test_result_file} " +
                                                     "--stage ${params.STAGE}"