diff --git a/workflow/conf/aws_ondemand.config b/workflow/conf/aws_ondemand.config index 0c8b6ff0fd242cda9ca2fb43473e82f99547efef..79c5fc6d9431c377e4ac3ed16fde26f2192ded56 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 4708298a63ced25cd74edf2646fc3c67a0a7753c..f1935697bb1c1c7e6aeedf310d5da2f38da1811c 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' - } }