From 216967a73515a49000856d579680c1696adecf22 Mon Sep 17 00:00:00 2001 From: Tanner Lewis Date: Tue, 3 Sep 2024 10:14:32 -0500 Subject: [PATCH] Update naming of test account secret Signed-off-by: Tanner Lewis --- .../migrationIntegPipelines/rfsBackfillE2EPipeline.groovy | 4 ++-- vars/defaultIntegPipeline.groovy | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jenkins/migrationIntegPipelines/rfsBackfillE2EPipeline.groovy b/jenkins/migrationIntegPipelines/rfsBackfillE2EPipeline.groovy index b620412cd..a4e9038ca 100644 --- a/jenkins/migrationIntegPipelines/rfsBackfillE2EPipeline.groovy +++ b/jenkins/migrationIntegPipelines/rfsBackfillE2EPipeline.groovy @@ -67,8 +67,8 @@ defaultIntegPipeline( "--junitxml=${test_result_file} ${test_dir}/backfill_tests.py " + "--unique_id ${uniqueId} " + "-s" - 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') { + withCredentials([string(credentialsId: 'migrations-test-account-id', variable: 'MIGRATIONS_TEST_ACCOUNT_ID')]) { + withAWS(role: 'JenkinsDeploymentRole', roleAccount: "${MIGRATIONS_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 200f29234..cc67ac6f0 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: 'migration-test-account-id', variable: 'MIGRATION_TEST_ACCOUNT_ID')]) { - withAWS(role: 'JenkinsDeploymentRole', roleAccount: "${MIGRATION_TEST_ACCOUNT_ID}", duration: 5400, roleSessionName: 'jenkins-session') { + withCredentials([string(credentialsId: 'migrations-test-account-id', variable: 'MIGRATIONS_TEST_ACCOUNT_ID')]) { + withAWS(role: 'JenkinsDeploymentRole', roleAccount: "${MIGRATIONS_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: 'migration-test-account-id', variable: 'MIGRATION_TEST_ACCOUNT_ID')]) { - withAWS(role: 'JenkinsDeploymentRole', roleAccount: "${MIGRATION_TEST_ACCOUNT_ID}", duration: 3600, roleSessionName: 'jenkins-session') { + withCredentials([string(credentialsId: 'migrations-test-account-id', variable: 'MIGRATIONS_TEST_ACCOUNT_ID')]) { + withAWS(role: 'JenkinsDeploymentRole', roleAccount: "${MIGRATIONS_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}"