From cee6f2154731b0e055dff808e6e83e36587187a4 Mon Sep 17 00:00:00 2001 From: Anthony Lin Date: Mon, 11 Dec 2017 18:03:39 +0000 Subject: [PATCH] Add Pre-Flight Check to deploy_site Dag The Armada Health Check endpoint is ready for Airflow/Shipyard to consume This P.S adds the 'Pre-Flight Check' step back to the 'deploy_site' dag as part of the required workflow Note that we will include Promenade Health Check when the API is ready Change-Id: Ic3df76e1b6eac7fa4804f6a57eff374005a94073 --- shipyard_airflow/dags/deploy_site.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/shipyard_airflow/dags/deploy_site.py b/shipyard_airflow/dags/deploy_site.py index d35c6163..c52635b7 100644 --- a/shipyard_airflow/dags/deploy_site.py +++ b/shipyard_airflow/dags/deploy_site.py @@ -20,9 +20,10 @@ from airflow.operators import ConcurrencyCheckOperator from airflow.operators.python_operator import PythonOperator from airflow.operators.subdag_operator import SubDagOperator -from deckhand_get_design import get_design_deckhand from armada_deploy_site import deploy_site_armada +from deckhand_get_design import get_design_deckhand from drydock_deploy_site import deploy_site_drydock +from preflight_checks import all_preflight_checks from validate_site_design import validate_site_design """ NOTE: We are currently in the process of reviewing and merging patch sets @@ -36,6 +37,7 @@ for our current testing. Updates will be made to this test dag as we progress along with the integration testing and UCP code reviews/merge. """ +ALL_PREFLIGHT_CHECKS_DAG_NAME = 'preflight' ARMADA_BUILD_DAG_NAME = 'armada_build' DAG_CONCURRENCY_CHECK_DAG_NAME = 'dag_concurrency_check' DECKHAND_GET_DESIGN_VERSION = 'deckhand_get_design_version' @@ -77,6 +79,13 @@ concurrency_check = ConcurrencyCheckOperator( on_failure_callback=failure_handlers.step_failure_handler, dag=dag) +preflight = SubDagOperator( + subdag=all_preflight_checks( + PARENT_DAG_NAME, ALL_PREFLIGHT_CHECKS_DAG_NAME, args=default_args), + task_id=ALL_PREFLIGHT_CHECKS_DAG_NAME, + on_failure_callback=failure_handlers.step_failure_handler, + dag=dag) + get_design_version = SubDagOperator( subdag=get_design_deckhand( PARENT_DAG_NAME, DECKHAND_GET_DESIGN_VERSION, args=default_args), @@ -107,7 +116,8 @@ armada_build = SubDagOperator( # DAG Wiring concurrency_check.set_upstream(action_xcom) -get_design_version.set_upstream(concurrency_check) +preflight.set_upstream(concurrency_check) +get_design_version.set_upstream(preflight) validate_site_design.set_upstream(get_design_version) drydock_build.set_upstream(validate_site_design) armada_build.set_upstream(drydock_build)