Merge pull request #2503 from cloudfoundry-incubator/fix-release-pipe…

…line Build-args file should be JSON
cloudfoundry · Jun 22, 2018 · f3e2a69 · f3e2a69
2 parents 1a2290b + e324d4f
commit f3e2a69
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/deploy/ci/tasks/dev-releases/generate-tag-files.yml b/deploy/ci/tasks/dev-releases/generate-tag-files.yml
@@ -17,14 +17,15 @@ run:
     - |
       cd stratos
 
-      LATEST_TAG=$(git for-each-ref --sort=taggerdate --format '%(tag)' refs/tags | tail -1)
       if [ -z ${NIGHTLY_BUILD} ]; then
+        LATEST_TAG=$(git for-each-ref --sort=taggerdate --format '%(tag)' refs/tags | tail -1)
+      else
         LATEST_TAG=$(cat package.json | grep version | grep -Po "([0-9\.]?)*")-$(git log -1 --format="%h")
       fi
       cd ../image-tag
       echo "$LATEST_TAG" > v2-alpha-tag
       FILENAME="release-${LATEST_TAG}"
       cat > build-args << EOF
-      stratos_version="${LATEST_TAG}"
+      { "stratos_version": "${LATEST_TAG}" }
       EOF
       tar -cf ${FILENAME}.tar v2-alpha-tag build-args