From d9feb0ff73284d2abe816d63e3dddab173a2d1bc Mon Sep 17 00:00:00 2001
From: Jonathan Lee <jonathan-j-lee@users.noreply.github.com>
Date: Sat, 13 Oct 2018 15:40:13 -0700
Subject: [PATCH] Pipeline fixes (#630)

* Added seperate deploy-artifacts script

* Testing pipeline upload

* Revert test

* Fixed deploy-artifacts usage
---
 .travis.yml                         |  8 ++++----
 DevOps/pipeline/deploy-artifacts.sh | 11 +++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100755 DevOps/pipeline/deploy-artifacts.sh

diff --git a/.travis.yml b/.travis.yml
index 35b97f6d..53be1f2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,15 +49,15 @@ branches:
     - master
     - /^shepherd\/.*$/
     - /^dawn\/.*$/
+    - /^devops\/.*$/
+    - /^hibike\/.*$/
     - /^runtime\/.*$/
     - /^test\/.*$/
 deploy:
   provider: script
-  script:
-    - pushd DevOps/pipeline
-    - pipenv run python3 pipeline.py -k piecentral-artifacts.pem -a "$APP_ID" -t "$TRAVIS_TAG" -d artifacts
-    - popd
+  script: bash DevOps/pipeline/deploy-artifacts.sh "$APP_ID" "$TRAVIS_TAG" "$(pwd)/artifacts"
   on:
+    branch: master
     tags: true
     condition: $DEPLOY_ARTIFACTS = 1
 notifications:
diff --git a/DevOps/pipeline/deploy-artifacts.sh b/DevOps/pipeline/deploy-artifacts.sh
new file mode 100755
index 00000000..78be4060
--- /dev/null
+++ b/DevOps/pipeline/deploy-artifacts.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Usage: bash DevOps/pipeline/artifacts-pipeline.sh "<app-id>" "<tag>" "<artifacts-dir>"
+
+pushd DevOps
+pipenv install --dev
+pushd pipeline
+echo "Deploying artifacts for '$TRAVIS_TAG' ..."
+pipenv run python3 pipeline.py -k piecentral-artifacts.pem -a "$1" -t "$2" -d "$3"
+popd
+popd