Smoke test fixes (#154)

Author: andrebriggs

tests/README.md

@@ -94,7 +94,8 @@ If you wish to run these tests locally, skip ahead to
    following key/values:
    - AZDO_PROJECT (e.g. `bedrock`)
    - AZDO_ORG (e.g. `epicstuff`)
-   - AZDO_PAT (e.g. Personal Access Token with access to AZDO_PROJECT) <-- 🔒
+   - AZDO_PAT (e.g. Personal Access Token with _read/write/manage_ access to
+     AZDO_PROJECT) <-- 🔒
    - SP_APP_ID (e.g Service Principal App Id)
    - SP_PASS (e.g Service Principal Password) <-- 🔒
    - SP_TENANT (e.g Service Principal Tenant Id)

tests/functions.sh

@@ -208,15 +208,15 @@ function verify_pipeline_with_poll () {
         pipeline_status=$(tr '"\""' '"\\"' <<< "$pipeline_builds" | jq .[0].status)
         echo "pipeline_status this iteration --> $pipeline_status"
         if [ "$(echo $pipeline_status | grep 'completed')" != "" ]; then
-        pipeline_result=$(tr '"\""' '"\\"' <<< "$pipeline_builds" | jq .[0].result)
-        if [ "$(echo $pipeline_result | grep 'succeeded')" != "" ]; then
-            echo "Successful build for pipeline id $pipeline_id!"
-            loop_result=$pipeline_result
-            break
-        else
-            echo "Expected successful build for pipeline id $pipeline_id but result is $pipeline_result"
-            exit 1 
-        fi
+            pipeline_result=$(tr '"\""' '"\\"' <<< "$pipeline_builds" | jq .[0].result)
+            if [ "$(echo $pipeline_result | grep 'succeeded')" != "" ]; then
+                echo "Successful build for pipeline id $pipeline_id!"
+                loop_result=$pipeline_result
+                break
+            else
+                echo "Expected successful build for pipeline id $pipeline_id but result is $pipeline_result"
+                exit 1 
+            fi
         else
         echo "Pipeline Id $pipeline_id status is $pipeline_status. Sleeping for $poll_interval seconds"
         sleep $poll_interval
@@ -231,14 +231,20 @@ function verify_pipeline_with_poll () {
 function approve_pull_request () {
     all_prs=$(az repos pr list --org $1 --p $2) 
     pr_title=$3
-    pr_exists=$(tr '"\""' '"\\"' <<< "$all_prs" | jq -r --arg pr_title $pr_title '.[] | select(.title == $pr_title) | != null')
+
+    pr_exists=$(echo $all_prs | jq -r --arg pr_title "$pr_title" '.[] | select(.title == $pr_title) != null')
     if [ "$pr_exists" != "true" ]; then
         echo "PR for '$pr_title' not found"
         exit 1
     fi
-    pull_request_id=$(tr '"\""' '"\\"' <<< "$all_prs" | jq -r --arg pr_title $pr_title '.[] | select(.title == $pr_title) | .pullRequestId')
+    pull_request_id=$(echo $all_prs | jq -r --arg pr_title "$pr_title" '.[] | select(.title == $pr_title) | .pullRequestId')
     echo "Found pull request id $pull_request_id for '$pr_title'"
-    approve_result=$(az repos pr update --id $pull_request_id --auto-complete true -—org $1 --p $2)
-    echo "PR $pull_request_id approved"
-    # TODO verify actually successful
+    approve_result=$(az repos pr update --id "$pull_request_id" --auto-complete true --output json )
+
+    if [ "$(echo $approve_result | jq '.mergeStatus' | grep 'succeeded')" != "" ]; then
+        echo "PR $pull_request_id approved"
+    else
+        echo "Issue approving PR $pull_request_id"
+        exit 1
+    fi
 }

tests/validations.sh

@@ -131,7 +131,7 @@ spk hld install-manifest-pipeline -o $AZDO_ORG -d $AZDO_PROJECT -p $ACCESS_TOKEN
 pipeline_created=$(az pipelines show --name $hld_dir-to-$manifests_dir --org $AZDO_ORG_URL --p $AZDO_PROJECT)
 
 # Verify the pipeline run was successful
-verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $hld_dir-to-$manifests_dir 180 15
+verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $hld_dir-to-$manifests_dir 300 15
 
 # App Code Mono Repo set up 
 mkdir $mono_repo_dir
@@ -197,7 +197,7 @@ spk service install-build-pipeline -o $AZDO_ORG -r $mono_repo_dir -u $remote_rep
 pipeline_created=$(az pipelines show --name $pipeline_name --org $AZDO_ORG_URL --p $AZDO_PROJECT)
 
 # Verify the pipeline run was successful
-verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $pipeline_name 180 25
+verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $pipeline_name 300 25
 # TODO approve the PR this build creates on the HLD
 
 # Start creating a service revision
@@ -212,10 +212,10 @@ git push --set-upstream origin $branchName
 current_time=$(date +"%Y-%m-%d-%H-%M-%S")
 pr_title="Automated Test PR $current_time"
 echo "Creating pull request: '$pr_title'" 
-spk service create-revision -t $pr_title -d "Adding my new file" --org-name $AZDO_ORG --personal-access-token "$ACCESS_TOKEN_SECRET"  --remote-url $remote_repo_url >> $TEST_WORKSPACE/log.txt
+spk service create-revision -t "$pr_title" -d "Adding my new file" --org-name $AZDO_ORG --personal-access-token $ACCESS_TOKEN_SECRET --remote-url $remote_repo_url >> $TEST_WORKSPACE/log.txt
 
 echo "Attempting to approve pull request: '$pr_title'" 
 # Get the id of the pr created and set the PR to be approved
-approve_pull_request $AZDO_ORG_URL $AZDO_PROJECT $pr_title
-
+approve_pull_request $AZDO_ORG_URL $AZDO_PROJECT "$pr_title"
 
+# TODO hook up helm chart, approve HLD pull request, verify manifest gen pipeline