Merge pull request #1952 from edx/max/update-presupervisor

Add ecommerce, insights, and analyticsapi to pre-supervisor checks

playbooks/roles/supervisor/files/pre_supervisor_checks.py

@@ -14,6 +14,9 @@ MIGRATION_COMMANDS = {
         'lms':    "{python} {code_dir}/manage.py lms migrate --noinput --settings=aws --db-dry-run --merge",
         'cms':    "{python} {code_dir}/manage.py cms migrate --noinput --settings=aws --db-dry-run --merge",
         'xqueue': "{python} {code_dir}/manage.py xqueue migrate --noinput --settings=aws --db-dry-run --merge",
+        'ecommerce':     ". {env_file}; {python} {code_dir}/manage.py migrate --noinput --list",
+        'insights':      ". {env_file}; {python} {code_dir}/manage.py migrate --noinput --list",
+        'analytics_api': ". {env_file}; {python} {code_dir}/manage.py migrate --noinput --list"
     }
 HIPCHAT_USER = "PreSupervisor"
 
@@ -73,10 +76,37 @@ if __name__ == '__main__':
     xq_migration_args = parser.add_argument_group("xqueue_migrations",
             "Args for running xqueue migration checks.")
     xq_migration_args.add_argument("--xqueue-code-dir",
-            help="Location of the edx-platform code.")
+            help="Location of the xqueue code.")
     xq_migration_args.add_argument("--xqueue-python",
             help="Path to python to use for executing migration check.")
 
+    ecom_migration_args = parser.add_argument_group("ecommerce_migrations",
+            "Args for running ecommerce migration checks.")
+    ecom_migration_args.add_argument("--ecommerce-python",
+        help="Path to python to use for executing migration check.")
+    ecom_migration_args.add_argument("--ecommerce-env",
+        help="Location of the ecommerce environment file.")
+    ecom_migration_args.add_argument("--ecommerce-code-dir",
+        help="Location to of the ecommerce code.")
+
+    insights_migration_args = parser.add_argument_group("insights_migrations",
+            "Args for running insights migration checks.")
+    insights_migration_args.add_argument("--insights-python",
+        help="Path to python to use for executing migration check.")
+    insights_migration_args.add_argument("--insights-env",
+        help="Location of the insights environment file.")
+    insights_migration_args.add_argument("--insights-code-dir",
+        help="Location to of the insights code.")
+
+    analyticsapi_migration_args = parser.add_argument_group("analytics_api_migrations",
+            "Args for running analytics_api migration checks.")
+    analyticsapi_migration_args.add_argument("--analytics-api-python",
+        help="Path to python to use for executing migration check.")
+    analyticsapi_migration_args.add_argument("--analytics-api-env",
+        help="Location of the analytics_api environment file.")
+    analyticsapi_migration_args.add_argument("--analytics-api-code-dir",
+        help="Location to of the analytics_api code.")
+
     hipchat_args = parser.add_argument_group("hipchat",
             "Args for hipchat notification.")
     hipchat_args.add_argument("-c","--hipchat-api-key",
@@ -183,6 +213,24 @@ if __name__ == '__main__':
                         output = subprocess.check_output(cmd, shell=True)
                         if 'Migrating' in output:
                             raise Exception("Migrations have not been run for {}".format(service))
+                else:
+                    new_services = {
+                        "ecommerce": {'python': args.ecommerce_python, 'env_file': args.ecommerce_env, 'code_dir': args.ecommerce_code_dir},
+                        "insights": {'python': args.insights_python, 'env_file': args.insights_env, 'code_dir': args.insights_code_dir},
+                        "analytics_api": {'python': args.analytics_api_python, 'env_file': args.analytics_api_env, 'code_dir': args.analytics_api_code_dir}
+                    }
+
+                    if service in new_services and all(arg!=None for arg in new_services[service].values()):
+                        serv_vars = new_services[service]
+
+                        cmd = MIGRATION_COMMANDS[service].format(**serv_vars)
+                        if os.path.exists(serv_vars['code_dir']):
+                            os.chdir(serv_vars['code_dir'])
+                            # Run migration check command.
+                            output = subprocess.check_output(cmd, shell=True, )
+                            if '[ ]' in output:
+                                raise Exception("Migrations have not been run for {}".format(service))
+
 
             # Link to available service.
             available_file = os.path.join(args.available, "{}.conf".format(service))

playbooks/roles/supervisor/templates/etc/init/pre_supervisor.conf.j2

@@ -5,4 +5,4 @@ task
 
 setuid {{ supervisor_user }}
 
-exec {{ supervisor_venv_dir }}/bin/python {{ supervisor_app_dir }}/pre_supervisor_checks.py --available={{ supervisor_available_dir }} --enabled={{ supervisor_cfg_dir }} {% if SUPERVISOR_HIPCHAT_API_KEY is defined %}--hipchat-api-key {{ SUPERVISOR_HIPCHAT_API_KEY }} --hipchat-room {{ SUPERVISOR_HIPCHAT_ROOM }} {% endif %} {% if edxapp_code_dir is defined %}--edxapp-python {{ COMMON_BIN_DIR }}/python.edxapp --edxapp-code-dir {{ edxapp_code_dir }}{% endif %} {% if xqueue_code_dir is defined %}--xqueue-code-dir {{ xqueue_code_dir }} --xqueue-python {{ COMMON_BIN_DIR }}/python.xqueue {% endif %}
+exec {{ supervisor_venv_dir }}/bin/python {{ supervisor_app_dir }}/pre_supervisor_checks.py --available={{ supervisor_available_dir }} --enabled={{ supervisor_cfg_dir }} {% if SUPERVISOR_HIPCHAT_API_KEY is defined %}--hipchat-api-key {{ SUPERVISOR_HIPCHAT_API_KEY }} --hipchat-room {{ SUPERVISOR_HIPCHAT_ROOM }} {% endif %} {% if edxapp_code_dir is defined %}--edxapp-python {{ COMMON_BIN_DIR }}/python.edxapp --edxapp-code-dir {{ edxapp_code_dir }}{% endif %} {% if xqueue_code_dir is defined %}--xqueue-code-dir {{ xqueue_code_dir }} --xqueue-python {{ COMMON_BIN_DIR }}/python.xqueue {% endif %} {% if ecommerce_code_dir is defined %}--ecommerce-env {{ ecommerce_home }}/ecommerce_env --ecommerce-code-dir {{ ecommerce_code_dir }} --ecommerce-python {{ COMMON_BIN_DIR }}/python.ecommerce {% endif %} {% if insights_code_dir is defined %}--insights-env {{ insights_home }}/insights_env --insights-code-dir {{ insights_code_dir }} --insights-python {{ COMMON_BIN_DIR }}/python.insights {% endif %} {% if analytics_api_code_dir is defined %}--analytics-api-env {{ analytics_api_home }}/analytics_api_env --analytics-api-code-dir {{ analytics_api_code_dir }} --analytics-api-python {{ COMMON_BIN_DIR }}/python.analytics_api {% endif %}