Skip to content
This repository was archived by the owner on Apr 13, 2020. It is now read-only.

Commit fd3f420

Browse files
mtarngbnookala
authored andcommitted
updating validation.sh smoke tests with the reduced lifecycle/manifest generation build count
1 parent 7d4a506 commit fd3f420

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

tests/validations.sh

+7-8
Original file line numberDiff line numberDiff line change
@@ -360,13 +360,11 @@ pipeline1id=$(az pipelines build list --definition-ids $pipeline_id --organizati
360360
# App Mono Repo create ring
361361
##################################
362362
echo "Create ring in mono repo"
363-
verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $lifecycle_pipeline_name 400 15 2
364-
echo "Finding pull request that $lifecycle_pipeline_name pipeline created..."
365-
approve_pull_request $AZDO_ORG_URL $AZDO_PROJECT "Reconciling HLD"
363+
verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $lifecycle_pipeline_name 400 15 1
366364

367365
# Wait for fabrikam-hld-to-fabrikam-manifests pipeline to finish
368366
echo "Wait for fabrikam-hld-to-fabrikam-manifests pipeline"
369-
verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $hld_to_manifest_pipeline_name 500 15 4
367+
verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $hld_to_manifest_pipeline_name 500 15 3
370368
ring_name=qa-ring
371369

372370
cd $TEST_WORKSPACE
@@ -381,12 +379,12 @@ git commit -m "Adding test ring"
381379
git push -u origin --all
382380

383381
# Wait for the lifecycle pipeline to finish and approve the pull request
384-
verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $lifecycle_pipeline_name 300 15 3
382+
verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $lifecycle_pipeline_name 300 15 2
385383
echo "Finding pull request that $lifecycle_pipeline_name pipeline created..."
386384
approve_pull_request $AZDO_ORG_URL $AZDO_PROJECT "Reconciling HLD"
387385

388386
# Wait for fabrikam-hld-to-fabrikam-manifests pipeline to finish
389-
verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $hld_to_manifest_pipeline_name 300 15 5
387+
verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $hld_to_manifest_pipeline_name 300 15 4
390388

391389
# Verify the file was added in the manifest repository
392390
cd $TEST_WORKSPACE
@@ -428,14 +426,15 @@ approve_pull_request $AZDO_ORG_URL $AZDO_PROJECT "Updating fabrikam.acme.fronten
428426

429427
# Wait for fabrikam-hld-to-fabrikam-manifests pipeline to finish
430428
echo "Wait for hld to fabrikam manifests"
431-
verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $hld_to_manifest_pipeline_name 400 15 6
429+
verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $hld_to_manifest_pipeline_name 400 15 5
432430

433431
echo "Validating ring image tag in manifest repo"
434432
cd $TEST_WORKSPACE/$hld_dir
435433
git pull
436434
cd $mono_repo_dir/$FrontEndCompliant/$ring_name/config
437435
image_repository=$(grep -A3 'image:' common.yaml | tail -n3 | awk '{print $2}' | head -n1 )
438436
image_tag=$(grep -A3 'image:' common.yaml | tail -n2 | awk '{print $2}' | head -n 1)
437+
echo "Image Repo and Tag: $image_repository:$image_tag"
439438
cd $TEST_WORKSPACE/$manifests_dir
440439
git pull
441440
validate_commit $image_tag
@@ -452,7 +451,7 @@ echo "Successfully reached the end of the service validations scripts."
452451

453452
# Verify hld to manifest pipeline run was successful, to verify the full end-end capture of
454453
# introspection data
455-
verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $hld_to_manifest_pipeline_name 300 15 6
454+
verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $hld_to_manifest_pipeline_name 300 15 5
456455

457456
cd $TEST_WORKSPACE
458457
cd ..

0 commit comments

Comments
 (0)