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

Commit f1f90d0

Browse files
edaenaEdaena Salinasmtarng
authored
Rings integration tests: update (#473)
* Update ring * Verify the ring is updated * Update comments * Add comment Co-authored-by: Edaena Salinas <[email protected]> Co-authored-by: Michael Tarng <[email protected]>
1 parent ebfa1f9 commit f1f90d0

File tree

1 file changed

+42
-10
lines changed

1 file changed

+42
-10
lines changed

tests/validations.sh

+42-10
Original file line numberDiff line numberDiff line change
@@ -356,15 +356,17 @@ validate_file "$TEST_WORKSPACE/$manifests_dir/prod/$mono_repo_dir/$FrontEndCompl
356356
# Get the current pipeline/build id at this stage. This will be used by the introspection integration test.
357357
pipeline1id=$(az pipelines build list --definition-ids $pipeline_id --organization $AZDO_ORG_URL --project $AZDO_PROJECT | jq '.[0].id')
358358

359-
##################################
360-
# App Mono Repo create ring
361-
##################################
359+
# ##################################
360+
# # App Mono Repo create ring
361+
# ##################################
362+
# echo "Create ring in mono repo"
362363
# verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $lifecycle_pipeline_name 400 15 2
363364
# echo "Finding pull request that $lifecycle_pipeline_name pipeline created..."
364365
# approve_pull_request $AZDO_ORG_URL $AZDO_PROJECT "Reconciling HLD"
365366

366367
# # Wait for fabrikam-hld-to-fabrikam-manifests pipeline to finish
367-
# verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $hld_to_manifest_pipeline_name 400 15 4
368+
# 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
368370
# ring_name=qa-ring
369371

370372
# cd $TEST_WORKSPACE
@@ -404,19 +406,49 @@ pipeline1id=$(az pipelines build list --definition-ids $pipeline_id --organizati
404406

405407
# echo "Successfully created a ring."
406408

407-
# --------------------------------
408-
# Push the ring branch
409+
# ##################################
410+
# # App Mono Repo update ring
411+
# ##################################
412+
# echo "Update ring."
413+
# cd $TEST_WORKSPACE
414+
# cd $mono_repo_dir
409415
# git branch $ring_name
410416
# git checkout $ring_name
417+
# cd services/$FrontEnd
418+
# echo "Ring doc" >> ringDoc.md
419+
# git add ringDoc.md
420+
# git commit -m "Adding ring doc file"
421+
# git push --set-upstream origin $ring_name
422+
423+
# # Verify frontend service pipeline run was successful
424+
# verify_pipeline_with_poll $AZDO_ORG_URL $AZDO_PROJECT $frontend_pipeline_name 300 15 3
425+
# #complete merge
426+
# echo "Finding pull request that $frontend_pipeline_name pipeline created..."
427+
# approve_pull_request $AZDO_ORG_URL $AZDO_PROJECT "Updating fabrikam.acme.frontend image tag to qa-ring"
411428

412-
429+
# # Wait for fabrikam-hld-to-fabrikam-manifests pipeline to finish
430+
# 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
432+
433+
# echo "Validating ring image tag in manifest repo"
434+
# cd $TEST_WORKSPACE/$hld_dir
435+
# git pull
436+
# cd $mono_repo_dir/$FrontEndCompliant/$ring_name/config
437+
# image_repository=$(grep -A3 'image:' common.yaml | tail -n3 | awk '{print $2}' | head -n1 )
438+
# image_tag=$(grep -A3 'image:' common.yaml | tail -n2 | awk '{print $2}' | head -n 1)
439+
# cd $TEST_WORKSPACE/$manifests_dir
440+
# git pull
441+
# validate_commit $image_tag
442+
# validate_file "$TEST_WORKSPACE/$manifests_dir/prod/$mono_repo_dir/$FrontEndCompliant/$ring_name/chart.yaml" "image: $image_repository:$image_tag"
443+
444+
# echo "Successfully updated a ring."
413445
# --------------------------------
414446

415447
echo "Successfully reached the end of the service validations scripts."
416448

417-
# ##################################
418-
# # SPK Introspection Validation START
419-
# ##################################
449+
##################################
450+
# SPK Introspection Validation START
451+
##################################
420452

421453
pipeline1id=$(az pipelines build list --definition-ids $pipeline_id --organization $AZDO_ORG_URL --project $AZDO_PROJECT | jq '.[0].id')
422454

0 commit comments

Comments
 (0)