Skip to content

Commit 407b46b

Browse files
Nextflow CFT upgrade
1. Nextflow version fixed to 21.11.0 2. Removed the sudo prefix to the nextflow run command 3. Add the queue to the CFT output parameter 4. Java 8 upgrade to Java 17
1 parent 24c1c9f commit 407b46b

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

cft-templates/nextflow-advanced.yaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -522,11 +522,8 @@ Resources:
522522
Type: AWS::Batch::JobQueue
523523
Properties:
524524
Tags:
525-
Name: !Sub worker-node-queue-${AWS::StackName}
526-
JobQueueName:
527-
!Sub
528-
- 'job-queue-${RandomGUID}'
529-
- { RandomGUID: !Select [0, !Split ["-", !Select [2, !Split ["/", !Ref AWS::StackId ]]]] }
525+
Name: !Sub worker-node-queue-${Namespace}
526+
JobQueueName: !Sub worker-node-queue-${Namespace}
530527
Priority: 1
531528
State: ENABLED
532529
ComputeEnvironmentOrder:
@@ -547,7 +544,7 @@ Resources:
547544
cd /usr/bin
548545
sudo wget https://download.oracle.com/java/17/latest/jdk-17_linux-x64_bin.rpm
549546
sudo rpm -ivh jdk-17_linux-x64_bin.rpm
550-
curl -s https://get.nextflow.io | bash
547+
sudo wget -qO- https://github.com/nextflow-io/nextflow/releases/download/v21.11.0-edge/nextflow-21.11.0-edge-all | sudo bash
551548

552549
sudo yum update -y --security
553550
cd /root/
@@ -585,7 +582,10 @@ Resources:
585582
echo $InputDataLocation
586583
fi
587584

588-
cd .nextflow/
585+
sudo chown -R ec2-user:ec2-user /usr/bin/nextflow
586+
sudo cp -prf /root/.nextflow/ /home/ec2-user/
587+
cd /home/ec2-user/.nextflow/
588+
589589
PROJECT_NF_CONFIG=config
590590

591591
cat << EOF >> $PROJECT_NF_CONFIG
@@ -713,3 +713,5 @@ Outputs:
713713
Value: !Ref EC2LaunchTemplate
714714
WorkDataLocation:
715715
Value: !Sub ${S3Bucket}
716+
BatchQueue:
717+
Value: !Sub ${DefaultQueue}

0 commit comments

Comments
 (0)