Merge pull request #858 from edx/feanil/always_update_cache_prefixes

Feanil/always update cache prefixes

playbooks/roles/edxapp/defaults/main.yml

@@ -147,6 +147,8 @@ EDXAPP_LOCAL_GIT_IDENTITY: !!null
 # Configuration for database migration
 EDXAPP_TEST_MIGRATE_DB_NAME: "{{ COMMON_ENVIRONMENT }}_{{ COMMON_DEPLOYMENT }}_test_{{ EDXAPP_MYSQL_DB_NAME }}"
 
+EDXAPP_UPDATE_STATIC_FILES_KEY: false
+
 #-------- Everything below this line is internal to the role ------------
 
 #Use YAML references (& and *) and hash merge <<: to factor out shared settings

playbooks/roles/edxapp/templates/cms.env.json.j2

 {% do cms_env_config.update(EDXAPP_ENV_EXTRA) %}
+{% if EDXAPP_UPDATE_STATIC_FILES_KEY %}
+  {%- do cms_env_config['CACHES']['staticfiles'].update({'KEY_PREFIX': edxapp_dynamic_cache_key}) %}
+{% endif %}
 {{ cms_env_config | to_nice_json }}

playbooks/roles/edxapp/templates/lms-preview.env.json.j2

 {% do lms_preview_env_config.update(EDXAPP_ENV_EXTRA) %}
+{% if EDXAPP_UPDATE_STATIC_FILES_KEY %}
+  {%- do lms_preview_env_config['CACHES']['staticfiles'].update({'KEY_PREFIX': edxapp_dynamic_cache_key}) %}
+{% endif %}
 {{ lms_preview_env_config | to_nice_json }}

playbooks/roles/edxapp/templates/lms.env.json.j2

 {% do lms_env_config.update(EDXAPP_ENV_EXTRA) %}
+{% if EDXAPP_UPDATE_STATIC_FILES_KEY %}
+  {%- do lms_env_config['CACHES']['staticfiles'].update({'KEY_PREFIX': edxapp_dynamic_cache_key}) %}
+{% endif %}
 {{ lms_env_config | to_nice_json }}

util/vpc-tools/abbey.py

@@ -337,6 +337,10 @@ EDXAPP_LOCAL_GIT_IDENTITY: $secure_identity
 # this is so that the application can come
 # up healthy
 fake_migrations: true
+
+# Use the build number an the dynamic cache key.
+EDXOAPP_UPDATE_STATIC_FILES_KEY: true
+edxapp_dynamic_cache_key: {deployment}-{environment}-{play}-{build_id}
 EOF
 
 chmod 400 $secure_identity
@@ -377,7 +381,8 @@ rm -rf $base_dir
                 queue_name=run_id,
                 extra_vars_yml=extra_vars_yml,
                 git_refs_yml=git_refs_yml,
-                secure_vars=secure_vars)
+                secure_vars=secure_vars,
+                build_id=args.jenkin_build)
 
     ec2_args = {
         'security_group_ids': [security_group_id],