From 35ab0de265c0015f21e8aa907327b4c55ea01d17 Mon Sep 17 00:00:00 2001
From: Dr Nic Williams <drnicwilliams@gmail.com>
Date: Fri, 16 Nov 2018 11:52:07 +1000
Subject: [PATCH] if chart_name=. need base dir to be same as chart name

---
 ci/pipeline.yml   | 15 +++++++++------
 ci/scripts/shipit |  1 -
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index bccc8f9..8dd4cba 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -21,6 +21,9 @@ meta:
     name: starkandwayne/concourse-kubernetes
     tag: latest
 
+  helm:
+    chart_path: .
+
   git:
     email:  (( param "Please provide the git email for automated commits" ))
     name:   (( param "Please provide the git name for automated commits" ))
@@ -116,20 +119,20 @@ jobs:
               - name: git
             outputs:
               - name: gh
-              - name: pushme
+              - name: (( grab meta.name ))
               - name: notifications
             run:
               path: ./git/ci/scripts/shipit
               args: []
             params:
               CHART_NAME:   (( grab meta.name ))
-              CHART_ROOT:   .
+              CHART_ROOT:   (( grab meta.helm.chart_path ))
               REPO_ROOT:    git
               VERSION_FROM: version/number
               RELEASE_ROOT: gh
-              REPO_OUT:     pushme
-              BRANCH:        (( grab meta.github.branch ))
-              GITHUB_OWNER:  (( grab meta.github.owner ))
+              REPO_OUT:     (( grab meta.name ))
+              BRANCH:       (( grab meta.github.branch ))
+              GITHUB_OWNER: (( grab meta.github.owner ))
               GIT_EMAIL:      (( grab meta.git.email ))
               GIT_NAME:       (( grab meta.git.name ))
               NOTIFICATION_OUT: notifications
@@ -142,7 +145,7 @@ jobs:
         put: git
         params:
           rebase: true
-          repository: pushme
+          repository: (( grab meta.name ))
       - name: github-release
         put: github
         params:
diff --git a/ci/scripts/shipit b/ci/scripts/shipit
index 48f3f5d..29c7ace 100755
--- a/ci/scripts/shipit
+++ b/ci/scripts/shipit
@@ -89,7 +89,6 @@ header "Uploading helm chart to ${HELM_S3_BUCKET_URI}"
 set -e
 helm s3 push ${RELEASE_ROOT}/artifacts/${CHART_NAME}*.tgz our-repo --force
 set +e
-popd
 
 header "Update git repo with final release..."
 if [[ -z $(git config --global user.email) ]]; then