Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DDP-7596_CF_18_months #353

Open
wants to merge 1 commit into
base: DDP-6615-DDP-6622
Choose a base branch
from
Open

DDP-7596_CF_18_months #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions build-and-deploy-cloud-functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ gcloud --project=${PROJECT_ID} functions deploy \
--vpc-connector=projects/${PROJECT_ID}/locations/us-central1/connectors/appengine-default-connect


echo "Deploying kit boston tracking to ${PROJECT_ID}"
gcloud --project=${PROJECT_ID} functions deploy \
tbos-kit-ups-tracker \
--entry-point=org.broadinstitute.dsm.jobs.TestBostonUPSTrackingJob \
--runtime=java11 \
--trigger-topic=cf-kit-tracking \
--timeout=540\
--source=target/deployment \
--set-env-vars="PROJECT_ID=${PROJECT_ID},SECRET_ID=cf-kit-tracker,STUDY_MANAGER_SCHEMA=${STUDY_MANAGER_SCHEMA},STUDY_SERVER_SCHEMA=${STUDY_SERVER_SCHEMA}" \
--vpc-connector=projects/${PROJECT_ID}/locations/us-central1/connectors/appengine-default-connect
#echo "Deploying kit boston tracking to ${PROJECT_ID}"
#gcloud --project=${PROJECT_ID} functions deploy \
# tbos-kit-ups-tracker \
# --entry-point=org.broadinstitute.dsm.jobs.TestBostonUPSTrackingJob \
# --runtime=java11 \
# --trigger-topic=cf-kit-tracking \
# --timeout=540\
# --source=target/deployment \
# --set-env-vars="PROJECT_ID=${PROJECT_ID},SECRET_ID=cf-kit-tracker,STUDY_MANAGER_SCHEMA=${STUDY_MANAGER_SCHEMA},STUDY_SERVER_SCHEMA=${STUDY_SERVER_SCHEMA}" \
# --vpc-connector=projects/${PROJECT_ID}/locations/us-central1/connectors/appengine-default-connect

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part deploys the TestBostonUPSTrackingJob which we haven't changed, I commented this part out so when we deploy only the changed CF will be redeployed



Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/broadinstitute/dsm/cf/TestBostonKitTrackerDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public void accept(PubsubMessage pubsubMessage, Context context) throws Exceptio
" ))";
String SQL_AVOID_DELIVERED = " and (tracking_to_id is not null or tracking_return_id is not null ) and kit.test_result is null " +
" and ( ups_status_description is null or ups_status_description not like \"%Delivered%\") "+
" and from_unixtime(created_date/1000) > NOW() - INTERVAL 360 DAY"+
" and from_unixtime(created_date/1000) > NOW() - INTERVAL 540 DAY"+
" and (kit.ups_tracking_status is null or kit.ups_tracking_status not like \"%Delivered%\" or kit.ups_return_status is null or kit.ups_return_status not like \"%Delivered%\") " +
" order by kit.dsm_kit_request_id ASC LIMIT ?";
logger.info("Starting the UPS lookup job");
Expand Down