Merge pull request #7 from aws-samples/develop

add cromwell version selection

Author: wleepang

src/templates/cromwell/cromwell-aio.template.yaml

@@ -36,6 +36,7 @@ Metadata:
       - Label:
           default: "Cromwell Server"
         Parameters:
+          - CromwellVersion
           - InstanceType
           - InstanceName
           - SSHLocation
@@ -115,6 +116,16 @@ Parameters:
     Type: String
     Default: cromwell-server
     Description: The name of the EC2 instance that is created
+  CromwellVersion:
+    Type: String
+    Description: >-
+      Version of Cromwell to install. "latest" will retrieve the currently released
+      version of Cromwell from Github.
+    AllowedValues:
+      - latest
+      - 36.1
+      - 36
+    Default: 36.1
   SSHLocation:
     Description: "The IP address range that has SSH access to the EC2 instances"
     Type: String
@@ -171,6 +182,7 @@ Resources:
         VpcId: !GetAtt 'VpcStack.Outputs.VPCID'
         PublicSubnetID: !GetAtt 'VpcStack.Outputs.PublicSubnet1ID'
         InstanceName: !Join ["-", [!Ref 'InstanceName', !Select [2, !Split ["/", !Ref "AWS::StackId" ]]]]
+        CromwellVersion: !Ref CromwellVersion
         KeyName: !Ref 'KeyPairName'
         SSHLocation: !Ref 'SSHLocation'
         HTTPLocation: !Ref 'HTTPLocation'
@@ -185,6 +197,10 @@ Outputs:
     Description: >-
       Cromwell server public DNS name. Use this URL in a web browser or via curl
       to access Cromwell and submit workflows.
+  CromwellServerVersion:
+    Description: >-
+      Version of Cromwell installed.
+    Value: !Ref CromwellVersion
   VpcId:
     Description: >-
       The VPC created for your Cromwell stack. Use this ID if you need to launch

src/templates/cromwell/cromwell-server.template.yaml

@@ -42,6 +42,17 @@ Parameters:
     Default: /aws/service/ami-amazon-linux-latest/amzn-ami-hvm-x86_64-gp2
     AllowedValues:
       - /aws/service/ami-amazon-linux-latest/amzn-ami-hvm-x86_64-gp2
+  
+  CromwellVersion:
+    Type: String
+    Description: >-
+      Version of Cromwell to install. "latest" will retrieve the currently released
+      version of Cromwell from Github.
+    AllowedValues:
+      - latest
+      - 36.1
+      - 36
+    Default: 36.1
 
   InstanceName:
     Type: String
@@ -79,6 +90,14 @@ Parameters:
     Description: ARN of the AWS Batch Job Queue this server will use by default
     Type: String
 
+
+Conditions:
+  GetLatestCromwellVersion:
+    Fn::Equals:
+      - !Ref CromwellVersion
+      - latest
+
+
 # Resources
 Resources:
   Ec2InstanceRole:
@@ -221,11 +240,17 @@ Resources:
               group: root
 
             "/home/ec2-user/get_cromwell.sh":
-              content: !Sub |
+              content: !Sub
+              - |
                 #!/bin/bash
-                url=$(curl --silent "https://api.github.com/repos/broadinstitute/cromwell/releases/latest" | jq -r .assets[0].browser_download_url)
+                url=$(curl --silent "https://api.github.com/repos/broadinstitute/cromwell/releases/${CromwellVersionPath}" | jq -r .assets[0].browser_download_url)
                 curl -LO $url
-                ln -s $(find . | grep "cromwell.*\.jar") cromwell-latest.jar
+                ln -s $(find . | grep "cromwell.*\.jar") cromwell.jar
+              - CromwellVersionPath:
+                  Fn::If:
+                  - GetLatestCromwellVersion
+                  - !Ref CromwellVersion
+                  - !Join ["/", ["tags", !Ref CromwellVersion]]
 
               mode: "000755"
               owner: "ec2-user"
@@ -281,7 +306,7 @@ Resources:
             "/home/ec2-user/run_cromwell_server.sh":
               content: !Sub |
                 #!/bin/bash
-                java -Dconfig.file=cromwell.conf -jar cromwell-latest.jar server
+                java -Dconfig.file=cromwell.conf -jar cromwell.jar server
 
               mode: "000755"
               owner: "ec2-user"
@@ -487,6 +512,7 @@ Metadata:
       - Label:
           default: "Cromwell Configuration"
         Parameters:
+          - CromwellVersion
           - S3BucketName
           - BatchQueue
 
@@ -509,6 +535,8 @@ Metadata:
         default: "S3 Bucket Name"
       BatchQueue:
         default: "Default Batch Queue"
+      CromwellVersion:
+        default: "Cromwell Version"
 
 Outputs:
   EC2Instance: