Extending smoke test validations for builds and pull requests (#149)

Author: andrebriggs

smoke-test-pipeline.yml

@@ -62,6 +62,7 @@ stages:
         export SPK_LOCATION="$(pwd)/spk-linux"
         export ACCESS_TOKEN_SECRET=$(AZDO_PAT)
         export SP_PASS=$(SP_PASS)
+        export SP_TENANT=$(SP_TENANT)
 
         # Include dependent scripts
         . ./functions.sh
@@ -73,4 +74,9 @@ stages:
         status=$?
         [ $status -eq 0 ] && echo "Test Done!" || (echo "Test had issues" && exit 1)
       #failOnStderr: true
-      displayName: "Run Tests"
+      displayName: "Run Tests"
+    - task: PublishPipelineArtifact@1
+      inputs:
+        path: $(System.DefaultWorkingDirectory)/spk-env/log.txt
+        artifact: test_logs
+      condition: always()

tests/functions.sh

@@ -180,3 +180,65 @@ function hld_pipeline_exists () {
         az pipelines delete --id "$pipeline_id" --yes --org $1 --p $2
     fi
 }
+
+function verify_pipeline_with_poll () {
+    local pipeline_name=$3
+    poll_timeout=$4
+    poll_interval=$5
+    end=$((SECONDS+$poll_timeout))
+    loop_result="unknown"
+    
+    echo "Attempting to verify that the pipeline build for $pipeline_name is successful..."
+    pipeline_result=$(az pipelines build definition show --name $pipeline_name --org $AZDO_ORG_URL --p $AZDO_PROJECT)
+    pipeline_id=$(tr '"\""' '"\\"' <<< "$pipeline_result" | jq .id)
+    echo "$pipeline_name has pipeline id of $pipeline_id"
+
+    while [ $SECONDS -lt $end ]; do
+        pipeline_builds=$(az pipelines build list --definition-ids $pipeline_id --org $1 --p $2)
+        
+        # We expect only 1 build right now
+        build_count=$(tr '"\""' '"\\"' <<< "$pipeline_builds" | jq '. | length')
+        if [ "$build_count" != "1"  ]; then 
+            echo "Expected 1 build for pipeline id $pipeline_id but found $build_count"
+            exit 1 
+        fi
+
+        # We use grep because of string matching issues
+        echo "Get the build status for build..."
+        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
+        else
+        echo "Pipeline Id $pipeline_id status is $pipeline_status. Sleeping for $poll_interval seconds"
+        sleep $poll_interval
+        fi 
+    done
+    if [ "$loop_result" = "unknown" ]; then
+        echo "Polling the build timed out after $poll_timeout seconds!"
+        exit 1
+    fi
+}
+
+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')
+    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')
+    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
+}

tests/validations.sh

@@ -129,7 +129,9 @@ spk hld install-manifest-pipeline -o $AZDO_ORG -d $AZDO_PROJECT -p $ACCESS_TOKEN
 
 # Verify the pipeline was created
 pipeline_created=$(az pipelines show --name $hld_dir-to-$manifests_dir --org $AZDO_ORG_URL --p $AZDO_PROJECT)
-# TODO: Verify the pipeline run was successful
+
+# Verify the pipeline run was successful
+verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $hld_dir-to-$manifests_dir 180 15
 
 # App Code Mono Repo set up 
 mkdir $mono_repo_dir
@@ -186,12 +188,17 @@ git push -u origin --all
 # First we should check what pipelines exist. If there is a pipeline with the same name we should delete it
 pipeline_exists $AZDO_ORG_URL $AZDO_PROJECT $FrontEnd
 
+pipeline_name="$FrontEnd-pipeline"
+
 # Create a pipeline since the code exists in remote repo
-spk service install-build-pipeline -o $AZDO_ORG -r $mono_repo_dir -u $remote_repo_url -d $AZDO_PROJECT -l $services_dir -p $ACCESS_TOKEN_SECRET -v $FrontEnd  >> $TEST_WORKSPACE/log.txt
+spk service install-build-pipeline -o $AZDO_ORG -r $mono_repo_dir -u $remote_repo_url -d $AZDO_PROJECT -l $services_dir -p $ACCESS_TOKEN_SECRET -n $pipeline_name -v $FrontEnd  >> $TEST_WORKSPACE/log.txt
 
 # Verify the pipeline was created
-pipeline_created=$(az pipelines show --name $FrontEnd-pipeline --org $AZDO_ORG_URL --p $AZDO_PROJECT)
-# TODO: Verify the pipeline run was successful
+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
+# TODO approve the PR this build creates on the HLD
 
 # Start creating a service revision
 git branch $branchName
@@ -202,7 +209,13 @@ git commit -m "Adding my new file"
 git push --set-upstream origin $branchName
 
 # Create a PR for the change
-spk service create-revision -t "Automated Test PR" -d "Adding my new file" --org-name $AZDO_ORG --personal-access-token $ACCESS_TOKEN_SECRET  --remote-url $remote_repo_url >> $TEST_WORKSPACE/log.txt
+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
+
+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
+
 
-# TODO: Get the id of the pr created and set the PR to be approved
-# az repos pr update --id --bypass-policy --auto-complete