Verify build pipeline for ring

microsoft · Apr 14, 2020 · ce232d9 · ce232d9
1 parent 996e6b8
commit ce232d9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/docs/commands/data.json b/docs/commands/data.json
@@ -95,7 +95,7 @@
         "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"
+    "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 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: \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    --p1 $(Build.BuildId) \\\n    --image-tag $tag_name \\\n    --commit-id $commitId \\\n    --service $service \\\n    --repository $repourl\n```\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\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    --p3 $(Build.BuildId) \\ \n    --hld-commit-id $commitId \\ \n    --pr $pr_id \\\n    --repository $repourl\n```\n"
   },
   "deployment dashboard": {
     "command": "dashboard",

diff --git a/tests/functions.sh b/tests/functions.sh
@@ -539,6 +539,9 @@ function approve_pull_request () {
     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(.[0].title | startswith($pr_title)) | .[0].pullRequestId')
+    if [ "$pull_request_id" == "" ]; then
+        pull_request_id=$(echo $all_prs | jq -r --arg pr_title "$pr_title" 'select(.[].title | startswith($pr_title)) | .[0].pullRequestId')
+    fi
     echo "Found pull request starting with phrase '$pr_title'"
     echo "Pull request id $pull_request_id is '$real_title'"
 

diff --git a/tests/validations.sh b/tests/validations.sh
@@ -393,6 +393,7 @@ git push -u origin --all
 
 # Wait for the lifecycle pipeline to finish and approve the pull request
 mono_repo_commit_id=$(git log --format="%H" -n 1)
+verify_pipeline_with_poll_and_source_version $AZDO_ORG_URL $AZDO_PROJECT $frontend_pipeline_name 500 15 $mono_repo_commit_id
 verify_pipeline_with_poll_and_source_version $AZDO_ORG_URL $AZDO_PROJECT $lifecycle_pipeline_name 300 15 $mono_repo_commit_id
 echo "Finding pull request that $lifecycle_pipeline_name pipeline created..."
 approve_pull_request $AZDO_ORG_URL $AZDO_PROJECT "Reconciling HLD"