Merge pull request #24 from open-toolchain/fix/cos

fix the workdir 

.blue_green_deploy_pipeline/task.yaml

@@ -229,7 +229,7 @@ spec:
         fi
 
         cd /output
-        WORKDIR=/home/${HOST_USER_NAME}/app
+        WORKDIR=/home/${BASTION_HOST_USER_NAME}/app
         BACKUPDIR=${WORKDIR}_backup
         subpath="$(params.scripts-subpath)"
         source <(curl -sSL "$COMMON_HOSTED_REGION/scripts/deployment_strategies/blue_green/vsi/setup-remote-deploy-blue-green.sh")
@@ -367,6 +367,10 @@ spec:
           value: $(params.commons-hosted-region)
       script: |
         #!/bin/bash
+        cd /output
+        WORKDIR=/home/${BASTION_HOST_USER_NAME}/app
+        BACKUPDIR=${WORKDIR}_backup
+        subpath="$(params.scripts-subpath)"
         source <(curl -sSL "$COMMON_HOSTED_REGION/scripts/deployment_strategies/blue_green/vsi/switch-blue-green.sh")
 ---
 apiVersion: tekton.dev/v1beta1

.bluemix/images/vpc.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M31.687 13.539a.477.477 0 0 0-.06-.067 1.615 1.615 0 0 0-.587-.456l-4.217-1.843a1.706 1.706 0 0 0-1.257-.045L22.532 12.2V8.412c0-.22-.063-.426-.152-.62-.004-.013-.001-.026-.006-.04-.013-.035-.037-.063-.058-.093a1.605 1.605 0 0 0-.745-.675l-4.215-1.842a1.735 1.735 0 0 0-1.258-.045L11.58 6.693a1.62 1.62 0 0 0-.817.651.456.456 0 0 0-.082.121c-.009.02-.007.04-.012.061-.095.2-.163.412-.163.64v3.758l-.188.076-3.469-1.516a1.702 1.702 0 0 0-1.256-.045l-4.52 1.596c-.64.227-1.073.82-1.073 1.472v4.401c0 .577.33 1.106.87 1.386l4.413 2.172a1.729 1.729 0 0 0 1.435.062l3.31-1.289v3.012c0 .576.33 1.105.87 1.384l4.414 2.174c.216.111.45.165.686.179.015.001.028.009.044.009l.01-.002c.016 0 .031.005.047.005.22 0 .442-.043.648-.13l4.321-1.695c.6-.25.987-.814.987-1.439v-3.144l3.202 1.563c.216.112.45.166.686.18.015.001.028.009.044.009.004 0 .007-.002.01-.003.016 0 .031.006.047.006.22 0 .442-.043.648-.13l4.322-1.695a1.57 1.57 0 0 0 .986-1.44v-4.639a1.51 1.51 0 0 0-.313-.904zm-12.404-1.383l1.532.692a1.6 1.6 0 0 0-.585.53c-.027.033-.056.065-.073.106-.007.018-.006.036-.01.055a1.487 1.487 0 0 0-.156.553l-2.987 1.152v-5.075c.05-.015.104-.025.153-.044l4.405-1.573v3.582l-1.875-.847a.488.488 0 0 0-.643.236.475.475 0 0 0 .24.633zm.69 2.97v2.053l-2.495-1.091 2.496-.962zm-3.549-9.129a.74.74 0 0 1 .54.02l3.978 1.739-4.127 1.474a.744.744 0 0 1-.575-.019l-4.141-1.686 4.325-1.528zm-4.949 6.568l2.087-.847c.247-.1.365-.38.263-.625a.488.488 0 0 0-.633-.26l-1.717.697V8.306l4.381 1.784c.057.025.118.038.178.057v5.028l-4.165-2.051a.25.25 0 0 0-.008-.017c-.003-.013 0-.026-.006-.04-.013-.034-.036-.06-.056-.089a1.577 1.577 0 0 0-.324-.392v-.021zm3.839 3.325l-3.288 1.16v-2.78l3.288 1.62zm-9.786 4.628l-4.215-2.076a.61.61 0 0 1-.343-.534v-4.347l4.38 1.871c.058.025.119.038.178.057v5.029zm.213-5.961L1.7 12.83l4.221-1.49a.736.736 0 0 1 .537.018l3.95 1.726-4.097 1.489a.74.74 0 0 1-.569-.016zm3.485 2a.49.49 0 0 0-.659.19.475.475 0 0 0 .192.649l1.448.785c-.105.207-.179.43-.179.669v.361l-3.53 1.375V15.51c.052-.015.106-.025.156-.044l4.403-1.6V17.4c-.05.02-.092.05-.138.074l-1.693-.917zm6.33 9.303l-4.215-2.076a.608.608 0 0 1-.343-.533v-4.319l4.38 1.842c.058.026.12.039.179.057v5.03zm.212-5.962l-4.075-1.713 4.256-1.503a.726.726 0 0 1 .538.019l3.78 1.652.005.002.178.078-4.111 1.482a.742.742 0 0 1-.571-.017zm5.317 3.838a.61.61 0 0 1-.384.554l-4.175 1.638v-5.075c.053-.014.106-.024.157-.044l4.402-1.586v4.513zm4.417-2.528l-3.447-1.684v-.427a1.49 1.49 0 0 0-.159-.635c-.003-.012-.001-.025-.006-.038-.003-.008-.009-.012-.012-.02l1.304-.553a.476.476 0 0 0 .254-.628.49.49 0 0 0-.637-.25l-1.68.712c-.008-.005-.015-.012-.024-.016l-.152-.066V14.324l4.38 1.797c.058.026.12.039.179.058v5.029zm.207-5.964l-4.126-1.693 4.31-1.522a.736.736 0 0 1 .538.018l3.827 1.673-3.976 1.542a.739.739 0 0 1-.573-.018zm5.321 3.839a.612.612 0 0 1-.384.554l-4.174 1.638v-5.076c.055-.015.112-.026.165-.047l4.393-1.704v4.635z" fill="#69a1d6"/></svg>
\ No newline at end of file

.bluemix/images/vsi.svg

-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path d="M16.04 24.413c0 .576-.408 1.042-.91 1.042-.503 0-.91-.466-.91-1.042s.407-1.041.91-1.041c.502 0 .91.466.91 1.041zm1.502-9.597a.522.522 0 0 0 .35-.647.512.512 0 0 0-.64-.355 1.473 1.473 0 0 1-.654.042.515.515 0 0 0-.59.434.52.52 0 0 0 .428.597 2.467 2.467 0 0 0 1.106-.071zm-1.599-.598a.522.522 0 0 0-.349-.648l-.852-.255a.522.522 0 0 0-.292 1l.852.255a.517.517 0 0 0 .641-.353zm2.67.238l.845-.284a.524.524 0 0 0 .326-.66.515.515 0 0 0-.653-.33l-.844.284a.524.524 0 0 0 .164 1.017.522.522 0 0 0 .163-.027zm-4.588-.811a.523.523 0 0 0-.349-.648l-.851-.254a.515.515 0 0 0-.642.352.523.523 0 0 0 .35.648l.851.255a.516.516 0 0 0 .641-.353zm6.486.172l.843-.285a.524.524 0 0 0 .326-.66.516.516 0 0 0-.653-.33l-.843.285a.524.524 0 0 0 .164 1.017.508.508 0 0 0 .163-.027zm-8.403-.745a.523.523 0 0 0-.349-.648l-.852-.254a.515.515 0 0 0-.641.353.523.523 0 0 0 .348.648l.853.254a.516.516 0 0 0 .641-.353zm10.3.106l.843-.284a.524.524 0 0 0 .327-.66.518.518 0 0 0-.654-.33l-.842.283a.524.524 0 0 0 .163 1.017.521.521 0 0 0 .163-.026zM10.191 12.5a.522.522 0 0 0-.35-.648l-.852-.255a.522.522 0 0 0-.292 1l.852.256a.517.517 0 0 0 .641-.353zm17.908-1.24l.843-.284a.524.524 0 0 0 .326-.66.516.516 0 0 0-.653-.33l-.843.284a.524.524 0 0 0 .163 1.017.508.508 0 0 0 .164-.027zm-23.661-.477a.523.523 0 0 0-.35-.649l-.852-.254a.517.517 0 0 0-.64.353.523.523 0 0 0 .348.648l.852.254a.517.517 0 0 0 .641-.353zm25.557-.162l.843-.284a.524.524 0 0 0 .243-.817.485.485 0 0 0 .277.051.52.52 0 0 0 .466-.568c-.049-.514-.397-.931-.937-1.076-.277-.075-.531.1-.605.378-.073.278.117.57.392.645.073.02.114.07.121.152a.53.53 0 0 0 .108.272.52.52 0 0 0-.392-.027l-.843.283a.524.524 0 0 0 .164 1.017.522.522 0 0 0 .163-.026zM2.52 10.21a.523.523 0 0 0-.349-.648l-.779-.233a.539.539 0 0 1-.085-.262c0-.02.003-.036.008-.05a.516.516 0 1 0-.965-.372c-.051.135-.076.28-.075.426 0 .318.12.665.322.927.051.066.105.132.175.166a.514.514 0 0 0 .255.144l.852.254a.517.517 0 0 0 .641-.353zm-.63-1.398l.859-.233a.523.523 0 0 0-.268-1.008l-.858.233a.523.523 0 0 0 .268 1.008zm28.29-.533a.523.523 0 0 0-.367-.638l-.858-.23a.513.513 0 0 0-.631.371.523.523 0 0 0 .366.638l.86.23a.517.517 0 0 0 .63-.371zm-26.358.008l.858-.234a.523.523 0 0 0 .364-.64.517.517 0 0 0-.633-.368l-.858.234a.523.523 0 0 0 .134 1.026c.045 0 .09-.006.135-.018zm24.425-.525a.522.522 0 0 0-.367-.637l-.859-.23a.522.522 0 0 0-.264 1.009l.859.23a.517.517 0 0 0 .63-.372zm-22.495 0l.858-.234a.523.523 0 0 0-.268-1.008l-.858.233a.523.523 0 0 0 .268 1.008zm20.562-.516a.522.522 0 0 0-.366-.637l-.86-.23a.522.522 0 0 0-.264 1.009l.86.23a.517.517 0 0 0 .63-.372zm-18.631-.01l.858-.234a.523.523 0 0 0-.268-1.008l-.858.233a.523.523 0 0 0 .268 1.008zm16.698-.506a.522.522 0 0 0-.367-.638l-.859-.229a.522.522 0 0 0-.264 1.009l.859.23a.517.517 0 0 0 .631-.372zM9.614 6.71l.858-.234a.523.523 0 0 0 .364-.64.517.517 0 0 0-.633-.368l-.858.234a.523.523 0 0 0 .134 1.026c.045 0 .09-.006.135-.018zm12.834-.496a.522.522 0 0 0-.367-.638l-.86-.229a.522.522 0 0 0-.264 1.009l.86.23a.517.517 0 0 0 .63-.372zm-10.904-.03l.858-.233a.523.523 0 0 0-.268-1.008l-.858.233a.523.523 0 0 0 .268 1.008zm8.971-.486a.522.522 0 0 0-.367-.638l-.86-.23a.522.522 0 0 0-.264 1.009l.86.23a.517.517 0 0 0 .631-.371zm-7.04-.04l.858-.233a.523.523 0 0 0-.268-1.008l-.858.233a.523.523 0 0 0 .268 1.008zm5.107-.477a.522.522 0 0 0-.367-.637l-.86-.23a.522.522 0 0 0-.264 1.009l.86.23a.517.517 0 0 0 .63-.372zm-3.176-.048l.179-.049c.156-.044.32-.053.485-.027.277.044.544-.152.587-.437s-.15-.55-.432-.594a2.204 2.204 0 0 0-.909.05l-.18.05a.523.523 0 0 0 .135 1.025c.045 0 .09-.006.135-.018zM32 17.833v3.889c0 .799-.498 1.499-1.24 1.741l-13.563 4.45a1.746 1.746 0 0 1-1.046.014l-14.87-4.472C.52 23.226-.007 22.496 0 21.682l.036-3.739a1.43 1.43 0 0 1 1.036-1.368l3.522-.918-3.567-1.065a1.205 1.205 0 0 1-.859-1.184 1.204 1.204 0 0 1 .886-1.165l3.56-.969a.514.514 0 0 1 .54-.822l.853.255a.502.502 0 0 1 .209.131l9.1-2.478a2.176 2.176 0 0 1 1.137-.002l9.481 2.53.784-.263a.516.516 0 0 1 .653.33.516.516 0 0 1-.006.316l3.573.954c.516.138.873.596.89 1.14a1.21 1.21 0 0 1-.818 1.198l-3.166 1.067 3.102.815c.62.161 1.054.732 1.054 1.388zm-15.588.264c.294.089.6.084.891-.015l13.38-4.509c.097-.033.115-.113.113-.175 0-.06-.024-.138-.122-.164l-5.188-1.385a.514.514 0 0 1-.338.405l-.844.284a.518.518 0 0 1-.653-.33.523.523 0 0 1 .327-.66l.17-.056-7.96-2.125a1.163 1.163 0 0 0-.603.001L8.124 11.4c.14.13.206.331.149.528a.516.516 0 0 1-.641.353l-.853-.254a.504.504 0 0 1-.257-.19l-5.2 1.415c-.099.027-.12.107-.121.169 0 .062.019.142.118.171l15.093 4.506zM2.12 17.38l14.441 4.46c.064.02.138.018.205-.005l13.398-4.515-4.118-1.083-8.417 2.836a2.476 2.476 0 0 1-1.51.025l-9.597-2.864-4.402 1.146zm28.848.77l-13.88 4.677a1.406 1.406 0 0 1-.823.012L1.066 18.145l-.034 3.547a.783.783 0 0 0 .544.763l14.869 4.471c.143.043.292.04.433-.005l13.563-4.45a.778.778 0 0 0 .527-.75V18.15z" fill="#69a1d6"/></svg>
\ No newline at end of file

.bluemix/toolchain.yml

@@ -8,7 +8,7 @@ template:
   description:
     $ref: "#/messages/template.description"
   header: "![](images/toolchain.svg?localize)"
-  icon: ./images/vsi.svg
+  icon: ./images/vpc.svg
   required:
     - deploy
     - build

.canary_deploy_pipeline/task.yaml

@@ -234,9 +234,8 @@ spec:
         if [[ -f "$FILE" ]]; then
           PIPELINERUNID=$(cat $FILE |jq -r '.pipeline_run_id')
         fi
-
         cd /output
-        WORKDIR=/home/${HOST_USER_NAME}/app
+        WORKDIR=/home/${BASTION_HOST_USER_NAME}/app
         BACKUPDIR=${WORKDIR}_backup
         subpath="$(params.scripts-subpath)"
         source <(curl -sSL "$COMMON_HOSTED_REGION/scripts/deployment_strategies/canary/vsi/setup-remote-deploy-canary.sh")
@@ -304,7 +303,11 @@ spec:
           value: $(params.commons-hosted-region)                                                              
       script: |
         #!/bin/bash
-        exit 0
+        cd /output
+        WORKDIR=/home/${BASTION_HOST_USER_NAME}/app
+        BACKUPDIR=${WORKDIR}_backup
+        subpath="$(params.scripts-subpath)"
+        source <(curl -sSL "$COMMON_HOSTED_REGION/scripts/deployment_strategies/canary/vsi/canary-test.sh")
 ---
 apiVersion: tekton.dev/v1beta1
 kind: Task
@@ -435,4 +438,8 @@ spec:
           value: $(params.commons-hosted-region)                                                               
       script: |
         #!/bin/bash
-        exit 0
\ No newline at end of file
+        cd /output
+        WORKDIR=/home/${BASTION_HOST_USER_NAME}/app
+        BACKUPDIR=${WORKDIR}_backup
+        subpath="$(params.scripts-subpath)"
+        source <(curl -sSL "$COMMON_HOSTED_REGION/scripts/deployment_strategies/canary/vsi/abort-canary.sh")
\ No newline at end of file

.deploy_pipeline/task.yaml

@@ -329,6 +329,9 @@ spec:
         echo "DEPLOY_STATUS=$DEPLOY_STATUS"
         echo "HEALTH_CHECK_STATUS=$HEALTH_CHECK_STATUS"
         echo "ACCEPTANCE_TEST_STATUS=$ACCEPTANCE_TEST_STATUS"
+        cd /output
+        WORKDIR=/home/${HOST_USER_NAME}/app
+        BACKUPDIR=${WORKDIR}_backup
         subpath="$(params.scripts-subpath)"
         if [ $DEPLOY_STATUS == "Failed" ] || [ $HEALTH_CHECK_STATUS == "Failed"  ] || [ $ACCEPTANCE_TEST_STATUS == "Failed"  ]; then
           source <(curl -ssL "$COMMON_HOSTED_REGION/scripts/deployment_strategies/basic/vsi/rollback-deploy.sh")

.rolling_deploy_pipeline/task.yaml

@@ -225,7 +225,7 @@ spec:
         fi
 
         cd /output
-        WORKDIR=/home/${HOST_USER_NAME}/app
+        WORKDIR=/home/${BASTION_HOST_USER_NAME}/app
         BACKUPDIR=${WORKDIR}_backup
         subpath="$(params.scripts-subpath)"
         source <(curl -sSL "$COMMON_HOSTED_REGION/scripts/deployment_strategies/rolling/vsi/setup-remote-rolling.sh")