From cc8e9cf49fb6e0623e14af23d868c5473c799c69 Mon Sep 17 00:00:00 2001 From: Graham Herceg Date: Wed, 18 Sep 2024 11:57:03 -0400 Subject: [PATCH] Don't update sentry release on update-config Specifically on formplayer, the release name was being set to the current release even when doing an "update in place", resulting in an unnecessary change being made to formplayer's application.properties --- .../ansible/roles/formplayer/tasks/main.yml | 10 ++++++++++ .../formplayer/templates/application.properties.j2 | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/commcare_cloud/ansible/roles/formplayer/tasks/main.yml b/src/commcare_cloud/ansible/roles/formplayer/tasks/main.yml index 3bcfa22605..6c0f12fd6e 100644 --- a/src/commcare_cloud/ansible/roles/formplayer/tasks/main.yml +++ b/src/commcare_cloud/ansible/roles/formplayer/tasks/main.yml @@ -166,6 +166,14 @@ - formplayer_deploy when: not _should_update_formplayer_in_place and current_stat.stat.exists +- name: Get current formplayer release + shell: "basename $(readlink {{ formplayer_current_dir }})-{{ env_monitoring_id }}" + check_mode: no + register: current_release_result + tags: + - localsettings + - formplayer_deploy + - name: Update formplayer config files become: yes template: @@ -179,6 +187,8 @@ filename: application.properties - template: logback-spring.xml.j2 filename: logback-spring.xml + vars: + formplayer_current_release_name: "{{ current_release_result.stdout }}" tags: - localsettings - formplayer_deploy diff --git a/src/commcare_cloud/ansible/roles/formplayer/templates/application.properties.j2 b/src/commcare_cloud/ansible/roles/formplayer/templates/application.properties.j2 index b032e06356..7753cf69eb 100644 --- a/src/commcare_cloud/ansible/roles/formplayer/templates/application.properties.j2 +++ b/src/commcare_cloud/ansible/roles/formplayer/templates/application.properties.j2 @@ -16,7 +16,7 @@ sentry.dsn={{ formplayer_sentry_dsn }} {% endif %} sentry.environment={{ env_monitoring_id }} sentry.tags.HQHost={{ host }} -sentry.release={{ formplayer_release_name }} +sentry.release={{ formplayer_current_release_name if _should_update_formplayer_in_place else formplayer_release_name }} spring.datasource.driver-class-name=org.postgresql.Driver spring.datasource.url=jdbc:postgresql://{{ postgresql_dbs.formplayer.pgbouncer_endpoint }}:{{ postgresql_dbs.formplayer.port