Skip to content

[AN-710] Turn back on AWS centaur tests #7801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

[AN-710] Turn back on AWS centaur tests #7801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cd92deb
[AN-710] Turn back on AWS centaur tests
lucymcnatt Aug 22, 2025
c593355
move comment
lucymcnatt Aug 26, 2025
0faddcd
Merge branch 'develop' into AN-710-aws-centaur
lucymcnatt Sep 5, 2025
d52cb0e
no spot
lucymcnatt Sep 16, 2025
2517793
oops queue
lucymcnatt Sep 16, 2025
551a7c5
Merge branch 'develop' into AN-710-aws-centaur
lucymcnatt Sep 17, 2025
96fce6c
change bucket name
lucymcnatt Sep 18, 2025
cd18dc0
Merge branch 'develop' into AN-710-aws-centaur
lucymcnatt Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...ur/src/main/resources/standardTestCases/resultsCopyingTestCases/awsWdlResultsCopying.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ metadata {

fileSystemCheck: "aws"
outputExpectations: {
"s3://cromwell-centaur-execution-new/wf_results/simpleWorkflow/<<UUID>>/call-simpleStdoutTask/output.txt": 1
"s3://cromwell-centaur-execution-new/wf_logs/workflow.<<UUID>>.log": 1
"s3://cromwell-centaur-execution-new/cl_logs/simpleWorkflow/<<UUID>>/call-simpleStdoutTask/simpleStdoutTask-stderr.log": 1
"s3://cromwell-centaur-execution-new/cl_logs/simpleWorkflow/<<UUID>>/call-simpleStdoutTask/simpleStdoutTask-stdout.log": 1
"s3://cromwell-centaur-execution-9-25/wf_results/simpleWorkflow/<<UUID>>/call-simpleStdoutTask/output.txt": 1
"s3://cromwell-centaur-execution-9-25/wf_logs/workflow.<<UUID>>.log": 1
"s3://cromwell-centaur-execution-9-25/cl_logs/simpleWorkflow/<<UUID>>/call-simpleStdoutTask/simpleStdoutTask-stderr.log": 1
"s3://cromwell-centaur-execution-9-25/cl_logs/simpleWorkflow/<<UUID>>/call-simpleStdoutTask/simpleStdoutTask-stdout.log": 1
}
8 changes: 4 additions & 4 deletions ...ain/resources/standardTestCases/resultsCopyingTestCases/awsWdlResultsCopyingRelative.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.<<UUID>>.log": 1
"s3://cromwell-centaur-execution-new/cl_logs/simpleWorkflow/<<UUID>>/call-simpleStdoutTask/simpleStdoutTask-stderr.log": 1
"s3://cromwell-centaur-execution-new/cl_logs/simpleWorkflow/<<UUID>>/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.<<UUID>>.log": 1
"s3://cromwell-centaur-execution-9-25/cl_logs/simpleWorkflow/<<UUID>>/call-simpleStdoutTask/simpleStdoutTask-stderr.log": 1
"s3://cromwell-centaur-execution-9-25/cl_logs/simpleWorkflow/<<UUID>>/call-simpleStdoutTask/simpleStdoutTask-stdout.log": 1
}
6 changes: 3 additions & 3 deletions ...in/resources/standardTestCases/resultsCopyingTestCases/wdlResultsCopying/aws/options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
6 changes: 3 additions & 3 deletions ...rces/standardTestCases/resultsCopyingTestCases/wdlResultsCopying/aws/optionsRelative.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
32 changes: 16 additions & 16 deletions src/ci/bin/testCentaurAws.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,22 @@ 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.)
# -i hello \
# -i mutect2.aws
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
-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
6 changes: 3 additions & 3 deletions src/ci/resources/aws_application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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:job-queue/priority-cromwell-ci-stack-9-25"
scriptBucketName: "cromwell-centaur-execution-9-25"
}

filesystems {
Expand Down
Loading