From cd92deb745f0dd589409aa7c21027276b19da168 Mon Sep 17 00:00:00 2001 From: lmcnatt <85642387+lucymcnatt@users.noreply.github.com> Date: Fri, 22 Aug 2025 10:50:57 -0400 Subject: [PATCH 1/5] [AN-710] Turn back on AWS centaur tests --- src/ci/bin/testCentaurAws.sh | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/ci/bin/testCentaurAws.sh b/src/ci/bin/testCentaurAws.sh index 4fb39986195..63aa393e577 100755 --- a/src/ci/bin/testCentaurAws.sh +++ b/src/ci/bin/testCentaurAws.sh @@ -22,21 +22,21 @@ export AWS_SECRET_KEY=$(vault read -field=secret_key secret/dsde/cromwell/common # TODO turn most tests back on once we resolve timeouts # TODO (AN-710) Add back some of these tests (space, scatter, docker_hash_dockerhub, awswdlresultscopying etc.) cromwell::build::run_centaur \ - -i hello \ - -i mutect2.aws -# -p 100 \ -# -e localdockertest \ -# -e abort.scheduled_abort \ -# -e relative_output_paths \ -# -e relative_output_paths_colliding \ -# -e standard_output_paths_colliding_prevented \ -# -e restart \ -# -e space \ -# -e scatter \ -# -e runtwiceexpectingcallcaching \ -# -e papi_v2alpha1_gcsa \ -# -e docker_hash_dockerhub \ -# -e awswdlresultscopying \ -# -e awswdlresultscopyingrelative +# -i hello \ +# -i mutect2.aws + -p 100 \ + -e localdockertest \ + -e abort.scheduled_abort \ + -e relative_output_paths \ + -e relative_output_paths_colliding \ + -e standard_output_paths_colliding_prevented \ + -e restart \ + -e space \ + -e scatter \ + -e runtwiceexpectingcallcaching \ + -e papi_v2alpha1_gcsa \ + -e docker_hash_dockerhub \ + -e awswdlresultscopying \ + -e awswdlresultscopyingrelative cromwell::build::generate_code_coverage From c5933557935e5399f266cc32b03a31b54ed64f5c Mon Sep 17 00:00:00 2001 From: lmcnatt <85642387+lucymcnatt@users.noreply.github.com> Date: Tue, 26 Aug 2025 18:19:30 -0400 Subject: [PATCH 2/5] move comment --- src/ci/bin/testCentaurAws.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/bin/testCentaurAws.sh b/src/ci/bin/testCentaurAws.sh index 63aa393e577..aebad8c15c3 100755 --- a/src/ci/bin/testCentaurAws.sh +++ b/src/ci/bin/testCentaurAws.sh @@ -21,9 +21,9 @@ export AWS_SECRET_KEY=$(vault read -field=secret_key secret/dsde/cromwell/common # TODO turn most tests back on once we resolve timeouts # TODO (AN-710) Add back some of these tests (space, scatter, docker_hash_dockerhub, awswdlresultscopying etc.) -cromwell::build::run_centaur \ # -i hello \ # -i mutect2.aws +cromwell::build::run_centaur \ -p 100 \ -e localdockertest \ -e abort.scheduled_abort \ From d52cb0e10116445e9b207b3351067512cc98dfd7 Mon Sep 17 00:00:00 2001 From: lmcnatt <85642387+lucymcnatt@users.noreply.github.com> Date: Tue, 16 Sep 2025 10:29:16 -0400 Subject: [PATCH 3/5] no spot --- src/ci/resources/aws_application.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ci/resources/aws_application.conf b/src/ci/resources/aws_application.conf index 0f10ac4bbe1..6f1079b07f1 100644 --- a/src/ci/resources/aws_application.conf +++ b/src/ci/resources/aws_application.conf @@ -49,8 +49,8 @@ backend { concurrent-job-limit = 24 default-runtime-attributes { - queueArn: "arn:aws:batch:us-east-1:952500931424:job-queue/priority-cromwell-ci-stack-newest" - scriptBucketName: "cromwell-centaur-execution-new" + queueArn: "arn:aws:batch:us-east-1:952500931424:compute-environment/cromwell-ci-stack-9-25" + scriptBucketName: "cromwell-centaur-execution-9-25" } filesystems { From 2517793fbeea32b093e48f0c4bbee75979544944 Mon Sep 17 00:00:00 2001 From: lmcnatt <85642387+lucymcnatt@users.noreply.github.com> Date: Tue, 16 Sep 2025 11:54:33 -0400 Subject: [PATCH 4/5] oops queue --- src/ci/resources/aws_application.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/resources/aws_application.conf b/src/ci/resources/aws_application.conf index 6f1079b07f1..bc74c0d0d1b 100644 --- a/src/ci/resources/aws_application.conf +++ b/src/ci/resources/aws_application.conf @@ -49,7 +49,7 @@ backend { concurrent-job-limit = 24 default-runtime-attributes { - queueArn: "arn:aws:batch:us-east-1:952500931424:compute-environment/cromwell-ci-stack-9-25" + queueArn: "arn:aws:batch:us-east-1:952500931424:job-queue/priority-cromwell-ci-stack-9-25" scriptBucketName: "cromwell-centaur-execution-9-25" } From 96fce6c9d67bfe7772974aaea9292891342e3e62 Mon Sep 17 00:00:00 2001 From: lmcnatt <85642387+lucymcnatt@users.noreply.github.com> Date: Thu, 18 Sep 2025 10:50:37 -0400 Subject: [PATCH 5/5] change bucket name --- .../resultsCopyingTestCases/awsWdlResultsCopying.test | 8 ++++---- .../awsWdlResultsCopyingRelative.test | 8 ++++---- .../wdlResultsCopying/aws/options.json | 6 +++--- .../wdlResultsCopying/aws/optionsRelative.json | 6 +++--- src/ci/resources/aws_application.conf | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/centaur/src/main/resources/standardTestCases/resultsCopyingTestCases/awsWdlResultsCopying.test b/centaur/src/main/resources/standardTestCases/resultsCopyingTestCases/awsWdlResultsCopying.test index a506fd9417f..eca4ac19a92 100644 --- a/centaur/src/main/resources/standardTestCases/resultsCopyingTestCases/awsWdlResultsCopying.test +++ b/centaur/src/main/resources/standardTestCases/resultsCopyingTestCases/awsWdlResultsCopying.test @@ -14,8 +14,8 @@ metadata { fileSystemCheck: "aws" outputExpectations: { - "s3://cromwell-centaur-execution-new/wf_results/simpleWorkflow/<>/call-simpleStdoutTask/output.txt": 1 - "s3://cromwell-centaur-execution-new/wf_logs/workflow.<>.log": 1 - "s3://cromwell-centaur-execution-new/cl_logs/simpleWorkflow/<>/call-simpleStdoutTask/simpleStdoutTask-stderr.log": 1 - "s3://cromwell-centaur-execution-new/cl_logs/simpleWorkflow/<>/call-simpleStdoutTask/simpleStdoutTask-stdout.log": 1 + "s3://cromwell-centaur-execution-9-25/wf_results/simpleWorkflow/<>/call-simpleStdoutTask/output.txt": 1 + "s3://cromwell-centaur-execution-9-25/wf_logs/workflow.<>.log": 1 + "s3://cromwell-centaur-execution-9-25/cl_logs/simpleWorkflow/<>/call-simpleStdoutTask/simpleStdoutTask-stderr.log": 1 + "s3://cromwell-centaur-execution-9-25/cl_logs/simpleWorkflow/<>/call-simpleStdoutTask/simpleStdoutTask-stdout.log": 1 } diff --git a/centaur/src/main/resources/standardTestCases/resultsCopyingTestCases/awsWdlResultsCopyingRelative.test b/centaur/src/main/resources/standardTestCases/resultsCopyingTestCases/awsWdlResultsCopyingRelative.test index e33fdc0d45f..c14dd791fee 100644 --- a/centaur/src/main/resources/standardTestCases/resultsCopyingTestCases/awsWdlResultsCopyingRelative.test +++ b/centaur/src/main/resources/standardTestCases/resultsCopyingTestCases/awsWdlResultsCopyingRelative.test @@ -14,8 +14,8 @@ metadata { fileSystemCheck: "aws" outputExpectations: { - "s3://cromwell-centaur-execution-new/wf_results/output.txt": 1 - "s3://cromwell-centaur-execution-new/wf_logs/workflow.<>.log": 1 - "s3://cromwell-centaur-execution-new/cl_logs/simpleWorkflow/<>/call-simpleStdoutTask/simpleStdoutTask-stderr.log": 1 - "s3://cromwell-centaur-execution-new/cl_logs/simpleWorkflow/<>/call-simpleStdoutTask/simpleStdoutTask-stdout.log": 1 + "s3://cromwell-centaur-execution-9-25/wf_results/output.txt": 1 + "s3://cromwell-centaur-execution-9-25/wf_logs/workflow.<>.log": 1 + "s3://cromwell-centaur-execution-9-25/cl_logs/simpleWorkflow/<>/call-simpleStdoutTask/simpleStdoutTask-stderr.log": 1 + "s3://cromwell-centaur-execution-9-25/cl_logs/simpleWorkflow/<>/call-simpleStdoutTask/simpleStdoutTask-stdout.log": 1 } diff --git a/centaur/src/main/resources/standardTestCases/resultsCopyingTestCases/wdlResultsCopying/aws/options.json b/centaur/src/main/resources/standardTestCases/resultsCopyingTestCases/wdlResultsCopying/aws/options.json index ca1de08c996..eabc8ec9a0e 100644 --- a/centaur/src/main/resources/standardTestCases/resultsCopyingTestCases/wdlResultsCopying/aws/options.json +++ b/centaur/src/main/resources/standardTestCases/resultsCopyingTestCases/wdlResultsCopying/aws/options.json @@ -1,6 +1,6 @@ { "use_relative_output_paths":false, - "final_workflow_outputs_dir":"s3://cromwell-centaur-execution-new/wf_results", - "final_workflow_log_dir":"s3://cromwell-centaur-execution-new/wf_logs", - "final_call_logs_dir":"s3://cromwell-centaur-execution-new/cl_logs" + "final_workflow_outputs_dir":"s3://cromwell-centaur-execution-9-25/wf_results", + "final_workflow_log_dir":"s3://cromwell-centaur-execution-9-25/wf_logs", + "final_call_logs_dir":"s3://cromwell-centaur-execution-9-25/cl_logs" } diff --git a/centaur/src/main/resources/standardTestCases/resultsCopyingTestCases/wdlResultsCopying/aws/optionsRelative.json b/centaur/src/main/resources/standardTestCases/resultsCopyingTestCases/wdlResultsCopying/aws/optionsRelative.json index 9c5ec718491..0312407f388 100644 --- a/centaur/src/main/resources/standardTestCases/resultsCopyingTestCases/wdlResultsCopying/aws/optionsRelative.json +++ b/centaur/src/main/resources/standardTestCases/resultsCopyingTestCases/wdlResultsCopying/aws/optionsRelative.json @@ -1,6 +1,6 @@ { "use_relative_output_paths":true, - "final_workflow_outputs_dir":"s3://cromwell-centaur-execution-new/wf_results", - "final_workflow_log_dir":"s3://cromwell-centaur-execution-new/wf_logs", - "final_call_logs_dir":"s3://cromwell-centaur-execution-new/cl_logs" + "final_workflow_outputs_dir":"s3://cromwell-centaur-execution-9-25/wf_results", + "final_workflow_log_dir":"s3://cromwell-centaur-execution-9-25/wf_logs", + "final_call_logs_dir":"s3://cromwell-centaur-execution-9-25/cl_logs" } diff --git a/src/ci/resources/aws_application.conf b/src/ci/resources/aws_application.conf index bc74c0d0d1b..a6687f8ec4d 100644 --- a/src/ci/resources/aws_application.conf +++ b/src/ci/resources/aws_application.conf @@ -40,7 +40,7 @@ backend { numSubmitAttempts = 3 numCreateDefinitionAttempts = 3 // Base bucket for workflow executions - root = "s3://cromwell-centaur-execution-new/cromwell-execution" + root = "s3://cromwell-centaur-execution-9-25/cromwell-execution" // A reference to an auth defined in the `aws` stanza at the top. This auth is used to create // Jobs and manipulate auth JSONs.