Merge branch 'master' into nate.patch.relative-paths

docs/commands/data.json

@@ -94,7 +94,8 @@
         "arg": "--repository <repository>",
         "description": "URL of the repository (SRC, HLD, Manifest)"
       }
-    ]
+    ],
+    "markdown": "## Description\n\nThis command inserts data about pipeline runs into Azure Table storage.\n\n## Example\n\nThe following command has parameters for Azure Table storage credential and\nvarious pipelines run details.\n\n```\nspk deployment create  -n $AZURE_STORAGE_ACCOUNT_NAME \\\n    -k $AZURE_ACCOUNT_KEY \\\n    -t $AZURE_TABLE_NAME  \\\n    -p $AZURE_TABLE_PARTITION_KEY \\\n    --p2 $(Build.BuildId) \\\n    --hld-commit-id $latest_commit \\\n    --env $(Build.SourceBranchName) \\\n    --image-tag $tag_name \\\n    --pr $pr_id \\\n    --repository $repourl\n```\n"
   },
   "deployment dashboard": {
     "command": "dashboard",
@@ -237,7 +238,7 @@
     "command": "append-variable-group <variable-group-name>",
     "alias": "avg",
     "description": "Appends the name of an existing variable group to the current manifest-generation.yaml file.",
-    "markdown": "## Description\n\nAppend a variable group name to the current `manifest-generation.yaml` of an\ninitialized hld repository.\n\n## Example\n\nWhen an HLD repository is first initialized with `spk hld init`, the top portion\nof the `manifest-generation.yaml` looks like this:\n\n```yaml\n# GENERATED WITH SPK VERSION 0.5.8\ntrigger:\n  branches:\n    include:\n      - master\nvariables: []\npool:\n  vmImage: ubuntu-latest\nsteps:\n.\n.\n.\n```\n\nrunning `spk hld append-variable-group my-vg` with a variable group name, in\nthis case `my-vg`, will add it under the `variables` section if it does not\nalready exist:\n\n```yaml\n# GENERATED WITH SPK VERSION 0.5.8\ntrigger:\n  branches:\n    include:\n      - master\nvariables:\n  - group: my-variable-group\npool:\n  vmImage: ubuntu-latest\nsteps:\n.\n.\n.\n```\n"
+    "markdown": "## Description\n\nAppend a variable group name to the current `manifest-generation.yaml` of an\ninitialized hld repository.\n\n## Example\n\nWhen an HLD repository is first initialized with `spk hld init`, the top portion\nof the `manifest-generation.yaml` looks like this:\n\n```yaml\ntrigger:\n  branches:\n    include:\n      - master\nvariables: []\npool:\n  vmImage: ubuntu-latest\nsteps:\n.\n.\n.\n```\n\nrunning `spk hld append-variable-group my-vg` with a variable group name, in\nthis case `my-vg`, will add it under the `variables` section if it does not\nalready exist:\n\n```yaml\ntrigger:\n  branches:\n    include:\n      - master\nvariables:\n  - group: my-variable-group\npool:\n  vmImage: ubuntu-latest\nsteps:\n.\n.\n.\n```\n"
   },
   "hld init": {
     "command": "init",

src/commands/deployment/create.md

@@ -0,0 +1,43 @@
+## Description
+
+This command inserts data about pipeline runs into Azure Table storage.
+
+## Example
+
+The following command has parameters for Azure Table storage credential and various pipelines run details. It's used by the source build pipeline, the release stage and the manifest generation pipeline, and each of them pass in parameters depending on the information for that pipeline. Here are three examples: 
+
+```
+spk deployment create  -n $AZURE_STORAGE_ACCOUNT_NAME \
+    -k $AZURE_ACCOUNT_KEY \
+    -t $AZURE_TABLE_NAME  \
+    -p $AZURE_TABLE_PARTITION_KEY \ 
+    --p1 $(Build.BuildId) \
+    --image-tag $tag_name \
+    --commit-id $commitId \
+    --service $service \
+    --repository $repourl
+```
+
+```
+spk deployment create  -n $AZURE_STORAGE_ACCOUNT_NAME \
+    -k $AZURE_ACCOUNT_KEY \
+    -t $AZURE_TABLE_NAME  \
+    -p $AZURE_TABLE_PARTITION_KEY \ 
+    --p2 $(Build.BuildId) \
+    --hld-commit-id $latest_commit \
+    --env $(Build.SourceBranchName) \
+    --image-tag $tag_name \
+    --pr $pr_id \
+    --repository $repourl
+```
+
+```
+spk deployment create  -n $AZURE_STORAGE_ACCOUNT_NAME \
+    -k $AZURE_ACCOUNT_KEY \
+    -t $AZURE_TABLE_NAME  \
+    -p $AZURE_TABLE_PARTITION_KEY \ 
+    --p3 $(Build.BuildId) \ 
+    --hld-commit-id $commitId \ 
+    --pr $pr_id \
+    --repository $repourl
+```

src/commands/hld/append-variable-group.md

@@ -9,7 +9,6 @@ When an HLD repository is first initialized with `spk hld init`, the top portion
 of the `manifest-generation.yaml` looks like this:
 
 ```yaml
-# GENERATED WITH SPK VERSION 0.5.8
 trigger:
   branches:
     include:
@@ -28,7 +27,6 @@ this case `my-vg`, will add it under the `variables` section if it does not
 already exist:
 
 ```yaml
-# GENERATED WITH SPK VERSION 0.5.8
 trigger:
   branches:
     include:

tests/functions.sh

@@ -532,11 +532,13 @@ function approve_pull_request () {
 
     pr_exists=$(echo $all_prs | sed 's/\\r\\n//g' | jq -r --arg pr_title "$pr_title" '.[].title | select(startswith($pr_title)) != null')
     if [ "$pr_exists" != "true" ]; then
-        echo "PR for '$pr_title' not found"
-        exit 1
+        if [ $pr_exists != *"true"* ]; then
+            echo "PR for '$pr_title' not found"
+            exit 1
+        fi
     fi
     real_title=$(echo $all_prs | jq -r --arg pr_title "$pr_title" 'select(.[].title | startswith($pr_title)) | .[].title' | head -n 1)
-    pull_request_id=$(echo $all_prs | jq -r --arg pr_title "$pr_title" 'select(.[].title | startswith($pr_title)) | .[0].pullRequestId')
+    pull_request_id=$(echo $all_prs | jq -r --arg pr_title "$pr_title" 'select(.[0].title | startswith($pr_title)) | .[0].pullRequestId')
     echo "Found pull request starting with phrase '$pr_title'"
     echo "Pull request id $pull_request_id is '$real_title'"