From 62aa9ff9a16bbbf8d3c707224bec81a66d3993d7 Mon Sep 17 00:00:00 2001 From: Jason Rothacker Date: Tue, 21 Jan 2025 15:35:50 -0800 Subject: [PATCH] Adding --wait to all cf run-task commands --- .github/workflows/deploy-application.yml | 3 +-- .github/workflows/destroy-and-regenerate-dissemination.yml | 2 +- .github/workflows/export-data-to-csv.yml | 4 ++-- .github/workflows/fac-backup-util-scheduled.yml | 2 +- .github/workflows/fac-backup-util.yml | 2 +- .github/workflows/fac-check-tables.yml | 2 +- .github/workflows/failed-data-migration-reprocessor.yml | 2 +- .github/workflows/historic-data-migrator-with-pagination.yml | 2 +- .github/workflows/historic-data-migrator.yml | 2 +- .github/workflows/materialized-views.yml | 4 ++-- 10 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy-application.yml b/.github/workflows/deploy-application.yml index 1adca0eacf..9d6f889840 100644 --- a/.github/workflows/deploy-application.yml +++ b/.github/workflows/deploy-application.yml @@ -77,8 +77,7 @@ jobs: cf_password: ${{ secrets.CF_PASSWORD }} cf_org: gsa-tts-oros-fac cf_space: ${{ env.space }} - command: cf run-task gsa-fac -k 7G -m 3G --name deploy_backup --command "./fac-backup-util.sh v0.1.10 deploy_backup" - + command: cf run-task gsa-fac -k 7G -m 3G --name deploy_backup --command "./fac-backup-util.sh v0.1.10 deploy_backup" --wait - name: Deploy Preview to cloud.gov if: ${{ inputs.environment == 'preview' }} uses: cloud-gov/cg-cli-tools@main diff --git a/.github/workflows/destroy-and-regenerate-dissemination.yml b/.github/workflows/destroy-and-regenerate-dissemination.yml index 4d0c03e6d4..d379902e40 100644 --- a/.github/workflows/destroy-and-regenerate-dissemination.yml +++ b/.github/workflows/destroy-and-regenerate-dissemination.yml @@ -28,4 +28,4 @@ jobs: cf_password: ${{ secrets.CF_PASSWORD }} cf_org: gsa-tts-oros-fac cf_space: ${{ env.space }} - command: cf run-task gsa-fac -k 2G -m 2G --name rebuild_dissemination --command "python manage.py delete_and_regenerate_dissemination_from_intake" + command: cf run-task gsa-fac -k 2G -m 2G --name rebuild_dissemination --command "python manage.py delete_and_regenerate_dissemination_from_intake" --wait diff --git a/.github/workflows/export-data-to-csv.yml b/.github/workflows/export-data-to-csv.yml index 4d2f2507c9..0a4c1e4af6 100644 --- a/.github/workflows/export-data-to-csv.yml +++ b/.github/workflows/export-data-to-csv.yml @@ -35,7 +35,7 @@ jobs: cf_password: ${{ secrets.CF_PASSWORD }} cf_org: gsa-tts-oros-fac cf_space: ${{ env.space }} - command: cf run-task gsa-fac -k 2G -m 2G --name export_data_to_csv --command "python manage.py export_data" + command: cf run-task gsa-fac -k 2G -m 2G --name export_data_to_csv --command "python manage.py export_data" --wait dispatch-data-export: if: ${{ github.event.inputs.environment != '' }} @@ -52,4 +52,4 @@ jobs: cf_password: ${{ secrets.CF_PASSWORD }} cf_org: gsa-tts-oros-fac cf_space: ${{ env.space }} - command: cf run-task gsa-fac -k 2G -m 2G --name export_data_to_csv --command "python manage.py export_data" + command: cf run-task gsa-fac -k 2G -m 2G --name export_data_to_csv --command "python manage.py export_data" --wait diff --git a/.github/workflows/fac-backup-util-scheduled.yml b/.github/workflows/fac-backup-util-scheduled.yml index f54ee70873..c966f2a02c 100644 --- a/.github/workflows/fac-backup-util-scheduled.yml +++ b/.github/workflows/fac-backup-util-scheduled.yml @@ -32,5 +32,5 @@ jobs: cf_password: ${{ secrets.CF_PASSWORD }} cf_org: gsa-tts-oros-fac cf_space: ${{ env.space }} - command: cf run-task gsa-fac -k 7G -m 3G --name backup_util_scheduled --command "./fac-backup-util.sh ${{ inputs.util_version }} ${{ inputs.backup_operation }}" + command: cf run-task gsa-fac -k 7G -m 3G --name backup_util_scheduled --command "./fac-backup-util.sh ${{ inputs.util_version }} ${{ inputs.backup_operation }}" --wait diff --git a/.github/workflows/fac-backup-util.yml b/.github/workflows/fac-backup-util.yml index 1f248d8b4f..bebcd3f4d5 100644 --- a/.github/workflows/fac-backup-util.yml +++ b/.github/workflows/fac-backup-util.yml @@ -41,4 +41,4 @@ jobs: cf_password: ${{ secrets.CF_PASSWORD }} cf_org: gsa-tts-oros-fac cf_space: ${{ env.space }} - command: cf run-task gsa-fac -k 7G -m 3G --name deploy_backup_util --command "./fac-backup-util.sh ${{ inputs.util_version }} ${{ inputs.backup_operation }}" + command: cf run-task gsa-fac -k 7G -m 3G --name deploy_backup_util --command "./fac-backup-util.sh ${{ inputs.util_version }} ${{ inputs.backup_operation }}" --wait diff --git a/.github/workflows/fac-check-tables.yml b/.github/workflows/fac-check-tables.yml index e096d06590..5feab3a588 100644 --- a/.github/workflows/fac-check-tables.yml +++ b/.github/workflows/fac-check-tables.yml @@ -51,4 +51,4 @@ jobs: cf_password: ${{ secrets.CF_PASSWORD }} cf_org: gsa-tts-oros-fac cf_space: ${{ env.space }} - command: cf run-task gsa-fac -k 2G -m 3G --name check_tables --command "./fac-backup-util.sh ${{ inputs.util_version }} ${{ inputs.backup_operation }}" + command: cf run-task gsa-fac -k 2G -m 3G --name check_tables --command "./fac-backup-util.sh ${{ inputs.util_version }} ${{ inputs.backup_operation }}" --wait diff --git a/.github/workflows/failed-data-migration-reprocessor.yml b/.github/workflows/failed-data-migration-reprocessor.yml index c9ec4b1483..36fe9da439 100644 --- a/.github/workflows/failed-data-migration-reprocessor.yml +++ b/.github/workflows/failed-data-migration-reprocessor.yml @@ -47,4 +47,4 @@ jobs: cf_password: ${{ secrets.CF_PASSWORD }} cf_org: gsa-tts-oros-fac cf_space: ${{ env.space }} - command: cf run-task gsa-fac -k 1G -m 1G --name failed_data_migration_reprocessor --command "python manage.py reprocess_failed_migration --year ${{ inputs.year }} --page_size ${{ inputs.page_size }} --pages ${{ inputs.pages }} --error_tag ${{ inputs.error_tag }}" + command: cf run-task gsa-fac -k 1G -m 1G --name failed_data_migration_reprocessor --command "python manage.py reprocess_failed_migration --year ${{ inputs.year }} --page_size ${{ inputs.page_size }} --pages ${{ inputs.pages }} --error_tag ${{ inputs.error_tag }}" --wait diff --git a/.github/workflows/historic-data-migrator-with-pagination.yml b/.github/workflows/historic-data-migrator-with-pagination.yml index 84c77f9926..23c3f6fa2b 100644 --- a/.github/workflows/historic-data-migrator-with-pagination.yml +++ b/.github/workflows/historic-data-migrator-with-pagination.yml @@ -43,4 +43,4 @@ jobs: cf_password: ${{ secrets.CF_PASSWORD }} cf_org: gsa-tts-oros-fac cf_space: ${{ env.space }} - command: cf run-task gsa-fac -k 1G -m 1G --name historic_data_migrator_with_pagination --command "python manage.py run_paginated_migration --year ${{ inputs.year }} --page_size ${{ inputs.page_size }} --pages ${{ inputs.pages }}" + command: cf run-task gsa-fac -k 1G -m 1G --name historic_data_migrator_with_pagination --command "python manage.py run_paginated_migration --year ${{ inputs.year }} --page_size ${{ inputs.page_size }} --pages ${{ inputs.pages }}" --wait diff --git a/.github/workflows/historic-data-migrator.yml b/.github/workflows/historic-data-migrator.yml index 10fa4e8cdc..8288a3e70e 100644 --- a/.github/workflows/historic-data-migrator.yml +++ b/.github/workflows/historic-data-migrator.yml @@ -39,4 +39,4 @@ jobs: cf_password: ${{ secrets.CF_PASSWORD }} cf_org: gsa-tts-oros-fac cf_space: ${{ env.space }} - command: cf run-task gsa-fac -k 2G -m 2G --name historic_data_migrator --command "python manage.py historic_data_migrator --dbkeys ${{ inputs.dbkeys }} --years ${{ inputs.years }}" + command: cf run-task gsa-fac -k 2G -m 2G --name historic_data_migrator --command "python manage.py historic_data_migrator --dbkeys ${{ inputs.dbkeys }} --years ${{ inputs.years }}" --wait diff --git a/.github/workflows/materialized-views.yml b/.github/workflows/materialized-views.yml index 359ed8e8d4..525b87667a 100644 --- a/.github/workflows/materialized-views.yml +++ b/.github/workflows/materialized-views.yml @@ -35,7 +35,7 @@ jobs: cf_password: ${{ secrets.CF_PASSWORD }} cf_org: gsa-tts-oros-fac cf_space: ${{ env.space }} - command: cf run-task gsa-fac -k 2G -m 2G --name scheduled_create_materialized_views --command "python manage.py materialized_views --create" + command: cf run-task gsa-fac -k 2G -m 2G --name scheduled_create_materialized_views --command "python manage.py materialized_views --create" --wait dispatch-materialized-views: if: ${{ github.event.inputs.environment != '' }} @@ -52,4 +52,4 @@ jobs: cf_password: ${{ secrets.CF_PASSWORD }} cf_org: gsa-tts-oros-fac cf_space: ${{ env.space }} - command: cf run-task gsa-fac -k 2G -m 2G --name dispatch_create_materialized_views --command "python manage.py materialized_views --create" + command: cf run-task gsa-fac -k 2G -m 2G --name dispatch_create_materialized_views --command "python manage.py materialized_views --create" --wait