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/bin/testCentaurAws.sh b/src/ci/bin/testCentaurAws.sh index 4fb39986195..aebad8c15c3 100755 --- a/src/ci/bin/testCentaurAws.sh +++ b/src/ci/bin/testCentaurAws.sh @@ -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 diff --git a/src/ci/resources/aws_application.conf b/src/ci/resources/aws_application.conf index 0f10ac4bbe1..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. @@ -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 {