Skip to content

Commit 527dfdd

Browse files
RLIndiaRLIndia
committed
Merge branch 'topic-release' into topic-r53
2 parents ea23436 + a96ddef commit 527dfdd

9 files changed

Lines changed: 1038 additions & 127 deletions

‎cft-templates/cromwell-advanced.yaml‎

Lines changed: 935 additions & 0 deletions
Large diffs are not rendered by default.

‎config/app-config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ if (configJson) {
2121
mkdirp.sync(config.tempDashboardHome);
2222
mkdirp.sync(config.dashboardHome);
2323

24-
module.exports = config;
24+
module.exports = config;

‎config/bot-context.json‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎config/config.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,5 +184,13 @@
184184
"dbName": "cc",
185185
"host": "localhost",
186186
"port": "27017"
187-
}
187+
},
188+
"isCachingEnable": true,
189+
"sleepTime": 1000,
190+
"enableWatchDog": true,
191+
"defaultPage":1,
192+
"defaultLimit":10,
193+
"linksForRg": {
194+
"termsAndConditions": "REPLACE_WITH_TERMS_CONDITIONS_DOC_URL"
195+
}
188196
}

‎config/email-config.json‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎config/freshService-config.json‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎config/global-config.json‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎config/settings-config.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"action": [
1414
{
1515
"action": "Stop",
16-
"imageUrl": "../../assets/images/no-stopping@2x.png"
16+
"imageUrl": "../../assets/images/stop.png"
1717
}
1818
]
1919
},
@@ -40,7 +40,7 @@
4040
},
4141
{
4242
"action": "Stop",
43-
"imageUrl": "../../assets/images/no-stopping@2x.png"
43+
"imageUrl": "../../assets/images/stop.png"
4444
}
4545
]
4646
}
@@ -143,7 +143,7 @@
143143
"action": [
144144
{
145145
"action": "Stop",
146-
"imageUrl": "../../assets/images/no-stopping@2x.png",
146+
"imageUrl": "../../assets/images/stop.png",
147147
"outputsRequired": [
148148
"InstanceId"
149149
]
@@ -179,7 +179,7 @@
179179
"action": [
180180
{
181181
"action": "Stop",
182-
"imageUrl": "../../assets/images/no-stopping@2x.png"
182+
"imageUrl": "../../assets/images/stop.png"
183183
},
184184
{
185185
"action": "Reboot",
@@ -229,7 +229,7 @@
229229
"action": [
230230
{
231231
"action": "Stop",
232-
"imageUrl": "../../assets/images/no-stopping@2x.png",
232+
"imageUrl": "../../assets/images/stop.png",
233233
"outputsRequired": [
234234
"InstanceId"
235235
]
@@ -265,7 +265,7 @@
265265
"action": [
266266
{
267267
"action": "Stop",
268-
"imageUrl": "../../assets/images/no-stopping@2x.png"
268+
"imageUrl": "../../assets/images/stop.png"
269269
},
270270
{
271271
"action": "Reboot",
@@ -323,7 +323,7 @@
323323
"action": [
324324
{
325325
"action": "Stop",
326-
"imageUrl": "../../assets/images/no-stopping@2x.png",
326+
"imageUrl": "../../assets/images/stop.png",
327327
"outputsRequired": [
328328
"InstanceId"
329329
]
@@ -359,7 +359,7 @@
359359
"action": [
360360
{
361361
"action": "Stop",
362-
"imageUrl": "../../assets/images/no-stopping@2x.png"
362+
"imageUrl": "../../assets/images/stop.png"
363363
},
364364
{
365365
"action": "Reboot",

‎dump/standardcatalogitems.json‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -712,3 +712,88 @@
712712
"permission_required": {}
713713
}
714714
}
715+
{
716+
"_id": {
717+
"$oid": "62010969011b8d521ccce386"
718+
},
719+
"name": "Cromwell Advanced",
720+
"description": "Use the scalability of AWS Batch to run Cromwell workflows. This is ideal for large workloads and larger data-sets.",
721+
"fileName": "cromwell-advanced.yaml",
722+
"tags": [
723+
{
724+
"Key": "EstimatedTimeToProvision",
725+
"Value": "10 Minutes"
726+
},
727+
{
728+
"Key": "DetailsLink",
729+
"Value": "https://gatk.broadinstitute.org/hc/en-us/categories/360002302312"
730+
},
731+
{
732+
"Key": "TypeOfProduct",
733+
"Value": "Research"
734+
},
735+
{
736+
"Key": "ALB",
737+
"Value": "true"
738+
},
739+
{
740+
"Key": "ApplicationPort",
741+
"Value": "443"
742+
},
743+
{
744+
"Key": "Service",
745+
"Value": "Cromwell"
746+
}
747+
],
748+
"owner": "RL",
749+
"portfolio": "RGPortfolio",
750+
"availableRegions": [],
751+
"assignedOU": [],
752+
"metaData": {
753+
"pre_provisioning": [
754+
{
755+
"code": "CFT_PARAMS",
756+
"params": [
757+
{
758+
"name": "PipelineName",
759+
"type": "RL::SC::PIPELINE"
760+
},
761+
{
762+
"name": "InputDataLocation",
763+
"type": "RL::SC::S3",
764+
"productName": "Amazon S3"
765+
},
766+
{
767+
"name": "OutputDataLocation",
768+
"type": "RL::SC::S3",
769+
"productName": "Amazon S3"
770+
},
771+
{
772+
"name": "ResearcherName",
773+
"type": "RL::SC::PARAM::HD"
774+
},
775+
{
776+
"name": "ProjectId",
777+
"type": "RL::SC::PARAM::HD"
778+
},
779+
{
780+
"name": "Namespace",
781+
"type": "RL::SC::PARAM::HD"
782+
}
783+
]
784+
}
785+
],
786+
"post_provisioning": [],
787+
"checks_before_assigning_product": [
788+
{
789+
"code": "AMI_ID_REQUIRED",
790+
"is_ami_required": true,
791+
"ami_id_list": [],
792+
"ami_path": "/RL/RG/StandardCatalog/cromwell-latest"
793+
}
794+
],
795+
"checks_after_assigning_product": [],
796+
"permission_required": {},
797+
"cost_resource": true
798+
}
799+
}

0 commit comments

Comments
 (0)