@@ -360,13 +360,11 @@ pipeline1id=$(az pipelines build list --definition-ids $pipeline_id --organizati
360
360
# App Mono Repo create ring
361
361
# #################################
362
362
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
366
364
367
365
# Wait for fabrikam-hld-to-fabrikam-manifests pipeline to finish
368
366
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
370
368
ring_name=qa-ring
371
369
372
370
cd $TEST_WORKSPACE
@@ -381,12 +379,12 @@ git commit -m "Adding test ring"
381
379
git push -u origin --all
382
380
383
381
# 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
385
383
echo " Finding pull request that $lifecycle_pipeline_name pipeline created..."
386
384
approve_pull_request $AZDO_ORG_URL $AZDO_PROJECT " Reconciling HLD"
387
385
388
386
# 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
390
388
391
389
# Verify the file was added in the manifest repository
392
390
cd $TEST_WORKSPACE
@@ -428,14 +426,15 @@ approve_pull_request $AZDO_ORG_URL $AZDO_PROJECT "Updating fabrikam.acme.fronten
428
426
429
427
# Wait for fabrikam-hld-to-fabrikam-manifests pipeline to finish
430
428
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
432
430
433
431
echo " Validating ring image tag in manifest repo"
434
432
cd $TEST_WORKSPACE /$hld_dir
435
433
git pull
436
434
cd $mono_repo_dir /$FrontEndCompliant /$ring_name /config
437
435
image_repository=$( grep -A3 ' image:' common.yaml | tail -n3 | awk ' {print $2}' | head -n1 )
438
436
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 "
439
438
cd $TEST_WORKSPACE /$manifests_dir
440
439
git pull
441
440
validate_commit $image_tag
@@ -452,7 +451,7 @@ echo "Successfully reached the end of the service validations scripts."
452
451
453
452
# Verify hld to manifest pipeline run was successful, to verify the full end-end capture of
454
453
# 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
456
455
457
456
cd $TEST_WORKSPACE
458
457
cd ..
0 commit comments