From 170b070690f65bdbc2736dd9a6fd95f04dd5df3d Mon Sep 17 00:00:00 2001 From: "Gervaise H. Henry" <gervaise.henry@utsouthwestern.edu> Date: Wed, 22 Apr 2020 21:33:49 -0500 Subject: [PATCH] Remove processes from AWS configs --- workflow/conf/aws_ondemand.config | 28 +++------------------------- workflow/conf/aws_spot.config | 26 ++------------------------ 2 files changed, 5 insertions(+), 49 deletions(-) diff --git a/workflow/conf/aws_ondemand.config b/workflow/conf/aws_ondemand.config index 0c8b6ff..79c5fc6 100755 --- a/workflow/conf/aws_ondemand.config +++ b/workflow/conf/aws_ondemand.config @@ -1,4 +1,4 @@ -workDir = 's3://gudmap.rbk/work' +workDir = 's3://' aws.client.storageEncryption = 'AES256' aws { region = 'us-east-2' @@ -9,29 +9,7 @@ aws { process { executor = 'awsbatch' - queue = 'highpriority-3278a8b0-1fc8-11ea-b1ac-021e2396e2cc' + queue = 'highpriority-' cpus = 1 memory = '2 GB' - - withName:parseMetadata { - cpus = 5 - } - withName:getRef { - cpus = 8 - } - withName:trimData { - cpus = 8 - memory = '2 GB' - } - withName:alignData { - cpus = 50 - memory = '5 GB' - } - withName:dedupData { - cpus = 2 - memory = '20 GB' - } - withName:fastqc { - memory = '5 GB' - } -} \ No newline at end of file +} diff --git a/workflow/conf/aws_spot.config b/workflow/conf/aws_spot.config index 4708298..f193569 100755 --- a/workflow/conf/aws_spot.config +++ b/workflow/conf/aws_spot.config @@ -1,4 +1,4 @@ -workDir = 's3://gudmap.rbk/work' +workDir = 's3://' aws.client.storageEncryption = 'AES256' aws { region = 'us-east-2' @@ -9,29 +9,7 @@ aws { process { executor = 'awsbatch' - queue = 'default-3278a8b0-1fc8-11ea-b1ac-021e2396e2cc' + queue = 'default-' cpus = 1 memory = '2 GB' - - withName:parseMetadata { - cpus = 5 - } - withName:getRef { - cpus = 8 - } - withName:trimData { - cpus = 8 - memory = '2 GB' - } - withName:alignData { - cpus = 50 - memory = '5 GB' - } - withName:dedupData { - cpus = 2 - memory = '20 GB' - } - withName:fastq { - memory = '5 GB' - } } -- GitLab