refactor how ebs-autoscale is retrieved

* provide options for retreiving develop, latest, or disttribution
release versions
* add shims for backward compatibility
* add distribution release build from upstream repo

Author: wleepang

_scripts/make-artifacts.sh

@@ -25,10 +25,32 @@ fi
 
 
 echo "repackaging:"
+
+# package ebs-autoscale
+# combines the latest release of amazon-ebs-autoscale with compatibility shim
+# scripts in ./ebs-autoscale/
 cd ${SOURCE_PATH}
+EBS_AUTOSCALE_VERSION=$(curl --silent "https://api.github.com/repos/awslabs/amazon-ebs-autoscale/releases/latest" | jq -r .tag_name)
+curl --silent -L \
+    "https://github.com/awslabs/amazon-ebs-autoscale/archive/${EBS_AUTOSCALE_VERSION}.tar.gz" \
+    -o ./amazon-ebs-autoscale.tar.gz 
+
+tar -xzvf ./amazon-ebs-autoscale.tar.gz
+mv ./amazon-ebs-autoscale*/ ./amazon-ebs-autoscale
+echo $EBS_AUTOSCALE_VERSION > ./amazon-ebs-autoscale/VERSION
+cp -Rfv ./amazon-ebs-autoscale/* ./ebs-autoscale/
+
 tar -czvf ${ARTIFACT_PATH}/aws-ebs-autoscale.tgz ./ebs-autoscale/
-tar -czvf ${ARTIFACT_PATH}/aws-ecs-additions.tgz ./ecs-additions/
 
+# add a copy of the release tarball for naming consistency
+tar -czvf ${ARTIFACT_PATH}/amazon-ebs-autoscale.tgz ./amazon-ebs-autoscale
+
+# add a retrieval script
+cp -vf ./ebs-autoscale/get-amazon-ebs-autoscale.sh ${ARTIFACT_PATH}
+
+# package ecs-additions
+cd ${SOURCE_PATH}
+tar -czvf ${ARTIFACT_PATH}/aws-ecs-additions.tgz ./ecs-additions/
 
 cd ${CWD}
 

src/ebs-autoscale/amazon-ebs-autoscale.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# this is a shim for backwards compatibility for releases <2.6.0
+# old steps:
+# - cd /opt && wget $artifactRootUrl/aws-ebs-autoscale.tgz && tar -xzf aws-ebs-autoscale.tgz
+# - sh /opt/ebs-autoscale/bin/init-ebs-autoscale.sh $scratchPath /dev/sdc  2>&1 > /var/log/init-ebs-autoscale.log
+sh /opt/a*-ebs-autoscale/install.sh $@

src/ebs-autoscale/bin/init-ebs-autoscale.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+VERSION=${1:-release}
+
+function develop() {
+    # retrieve the current development version of amazon-ebs-autoscale
+    # WARNING may not be fully tested or stable
+    git clone https://github.com/awslabs/amazon-ebs-autoscale.git
+    cd /opt/amazon-ebs-autoscale
+    git checkout master
+}
+
+function latest() {
+    # retrive the latest released version of amazon-ebs-autoscale
+    # recommended if you want instances to stay up to date with upstream updates
+    EBS_AUTOSCALE_VERSION=$(curl --silent "https://api.github.com/repos/awslabs/amazon-ebs-autoscale/releases/latest" | jq -r .tag_name)
+    curl --silent -L \
+        "https://github.com/awslabs/amazon-ebs-autoscale/archive/${EBS_AUTOSCALE_VERSION}.tar.gz" \
+        -o ./amazon-ebs-autoscale.tar.gz 
+
+    tar -xzvf ./amazon-ebs-autoscale.tar.gz
+    mv ./amazon-ebs-autoscale*/ ./amazon-ebs-autoscale
+    echo $EBS_AUTOSCALE_VERSION > ./amazon-ebs-autoscale/VERSION
+}
+
+function release() {
+    # retrieve the version of amazon-ebs-autoscale concordant with the latest 
+    # release of aws-genomics-workflows
+    # recommended if you have no other way to get the amazon-ebs-autoscale code
+    wget $artifactRootUrl/amazon-ebs-autoscale.tgz
+    tar -xzf amazon-ebs-autoscale.tgz
+}
+
+cd /opt
+VERSION

src/ebs-autoscale/get-amazon-ebs-autoscale.sh

@@ -27,9 +27,8 @@ Mappings:
         - service docker stop
         - cp -au /var/lib/docker /var/lib/docker.bk
         - rm -rf /var/lib/docker/*
-        - EBS_AUTOSCALE_VERSION=$(curl --silent "https://api.github.com/repos/awslabs/amazon-ebs-autoscale/releases/latest" | jq -r .tag_name)
-        - cd /opt && git clone https://github.com/awslabs/amazon-ebs-autoscale.git
-        - cd /opt/amazon-ebs-autoscale && git checkout $EBS_AUTOSCALE_VERSION
+        - cd /opt && wget $artifactRootUrl/get-amazon-ebs-autoscale.sh
+        - sh /opt/get-amazon-ebs-autoscale.sh
         - sh /opt/amazon-ebs-autoscale/install.sh $scratchPath /dev/sdc 2>&1 > /var/log/ebs-autoscale-install.log
         - sed -i 's+OPTIONS=.*+OPTIONS="--storage-driver btrfs"+g' /etc/sysconfig/docker-storage
         - cp -au /var/lib/docker.bk/* /var/lib/docker
@@ -40,9 +39,8 @@ Mappings:
 
     cromwell:
       additions: |-
-        - EBS_AUTOSCALE_VERSION=$(curl --silent "https://api.github.com/repos/awslabs/amazon-ebs-autoscale/releases/latest" | jq -r .tag_name)
-        - cd /opt && git clone https://github.com/awslabs/amazon-ebs-autoscale.git
-        - cd /opt/amazon-ebs-autoscale && git checkout $EBS_AUTOSCALE_VERSION
+        - cd /opt && wget $artifactRootUrl/get-amazon-ebs-autoscale.sh
+        - sh /opt/get-amazon-ebs-autoscale.sh
         - sh /opt/amazon-ebs-autoscale/install.sh $scratchPath /dev/sdc 2>&1 > /var/log/ebs-autoscale-install.log
         - cd /opt && wget $artifactRootUrl/aws-ecs-additions.tgz && tar -xzf aws-ecs-additions.tgz
         - sh /opt/ecs-additions/ecs-additions-cromwell.sh
@@ -53,9 +51,8 @@ Mappings:
         - service docker stop
         - cp -au /var/lib/docker /var/lib/docker.bk
         - rm -rf /var/lib/docker/*
-        - EBS_AUTOSCALE_VERSION=$(curl --silent "https://api.github.com/repos/awslabs/amazon-ebs-autoscale/releases/latest" | jq -r .tag_name)
-        - cd /opt && git clone https://github.com/awslabs/amazon-ebs-autoscale.git
-        - cd /opt/amazon-ebs-autoscale && git checkout $EBS_AUTOSCALE_VERSION
+        - cd /opt && wget $artifactRootUrl/get-amazon-ebs-autoscale.sh
+        - sh /opt/get-amazon-ebs-autoscale.sh
         - sh /opt/amazon-ebs-autoscale/install.sh $scratchPath /dev/sdc 2>&1 > /var/log/ebs-autoscale-install.log
         - sed -i 's+OPTIONS=.*+OPTIONS="--storage-driver btrfs"+g' /etc/sysconfig/docker-storage
         - cp -au /var/lib/docker.bk/* /var/lib/docker