From 82cb0530165205a5e6355e09b0f4446c41616d12 Mon Sep 17 00:00:00 2001 From: Olin Blodgett Date: Fri, 31 Jan 2020 07:36:24 -0500 Subject: [PATCH] Refactored naming most files --- cacher_run.yml | 33 --------------- launch_2.0.0.yml | 4 +- ...aybook.yml => playbook_launch_instance.yml | 0 ...sks_playbook.yml => playbook_pre_tasks.yml | 0 ...> playbook_run_api_integration_testing.yml | 15 ++++--- playbook_run_cacher.yml | 41 +++++++++++++++++++ ...ner_run.yml => playbook_run_file_gener.yml | 10 ++--- indexer_run.yml => playbook_run_indexer.yml | 24 +++++++---- ...aybook_run_indexer_integration_testing.yml | 10 ++--- loader_run.yml => playbook_run_loader.yml | 24 +++++++---- ...t_run.yml => playbook_run_loader_tests.yml | 10 ++--- qc_run.yml => playbook_run_qc.yml | 10 ++--- ...ook.yml => playbook_terminate_instance.yml | 0 ...ng.yml => run_api_integration_testing.yml} | 0 tasks/{cacher_run.yml => run_cacher.yml} | 0 ...{file_gener_run.yml => run_file_gener.yml} | 0 tasks/{indexer_run.yml => run_indexer.yml} | 0 ...ml => run_indexer_integration_testing.yml} | 0 tasks/{loader_run.yml => run_loader.yml} | 4 -- ...ader_test_run.yml => run_loader_tests.yml} | 0 tasks/{qc_run.yml => run_qc.yml} | 0 tasks/{docker_setup.yml => setup_docker.yml} | 0 tasks/terminate_instance.yml | 7 ++++ 23 files changed, 110 insertions(+), 82 deletions(-) delete mode 100644 cacher_run.yml rename launch_instance_playbook.yml => playbook_launch_instance.yml (100%) rename pre_tasks_playbook.yml => playbook_pre_tasks.yml (100%) rename api_integration_testing.yml => playbook_run_api_integration_testing.yml (68%) create mode 100644 playbook_run_cacher.yml rename file_gener_run.yml => playbook_run_file_gener.yml (70%) rename indexer_run.yml => playbook_run_indexer.yml (51%) rename indexer_integration_testing.yml => playbook_run_indexer_integration_testing.yml (66%) rename loader_run.yml => playbook_run_loader.yml (51%) rename loader_test_run.yml => playbook_run_loader_tests.yml (69%) rename qc_run.yml => playbook_run_qc.yml (70%) rename terminate_instance_playbook.yml => playbook_terminate_instance.yml (100%) rename tasks/{api_integration_testing.yml => run_api_integration_testing.yml} (100%) rename tasks/{cacher_run.yml => run_cacher.yml} (100%) rename tasks/{file_gener_run.yml => run_file_gener.yml} (100%) rename tasks/{indexer_run.yml => run_indexer.yml} (100%) rename tasks/{indexer_integration_testing.yml => run_indexer_integration_testing.yml} (100%) rename tasks/{loader_run.yml => run_loader.yml} (96%) rename tasks/{loader_test_run.yml => run_loader_tests.yml} (100%) rename tasks/{qc_run.yml => run_qc.yml} (100%) rename tasks/{docker_setup.yml => setup_docker.yml} (100%) create mode 100644 tasks/terminate_instance.yml diff --git a/cacher_run.yml b/cacher_run.yml deleted file mode 100644 index 01b5ac1..0000000 --- a/cacher_run.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- import_playbook: pre_tasks_playbook.yml -- import_playbook: launch_instance_playbook.yml - -- name: Configure Servers - hosts: launched - user: core - gather_facts: False - - roles: - - akirak.coreos-python - - vars_files: - - "environments/{{ env }}/main.yml" # ENV must always be loaded first - - "environments/shared_secrets.yml" - - "environments/shared_variables.yml" - - tasks: - - name: Setup Docker, Start Neo, Start Infinispan, Run Cacher, Push Images - block: - - include_tasks: tasks/install_docker_py.yml - - include_tasks: tasks/docker_setup.yml - - include_tasks: tasks/start_neo_data.yml - - include_tasks: tasks/start_infinispan_env.yml - - include_tasks: tasks/cacher_run.yml - - include_tasks: tasks/push_cacher_image.yml - - rescue: - - debug: - msg: 'Tasked Failed Terminating instances' - -- import_playbook: terminate_instance_playbook.yml diff --git a/launch_2.0.0.yml b/launch_2.0.0.yml index 06bfaae..535805b 100644 --- a/launch_2.0.0.yml +++ b/launch_2.0.0.yml @@ -97,7 +97,7 @@ - name: Setup Neo, Run Loader, Run Loader Tests block: - include_tasks: tasks/install_docker_py.yml - - include_tasks: tasks/docker_setup.yml + - include_tasks: tasks/setup_docker.yml - include_tasks: tasks/start_neo_data.yml - include_tasks: tasks/start_es_env.yml - include_tasks: tasks/start_api_swarm.yml @@ -123,4 +123,4 @@ # region: us-east-1 # aws_access_key: "{{ AWS_ACCESS_KEY }}" # aws_secret_key: "{{ AWS_SECRET_KEY }}" -# instance_ids: '{{ ec2.instance_ids }}' \ No newline at end of file +# instance_ids: '{{ ec2.instance_ids }}' diff --git a/launch_instance_playbook.yml b/playbook_launch_instance.yml similarity index 100% rename from launch_instance_playbook.yml rename to playbook_launch_instance.yml diff --git a/pre_tasks_playbook.yml b/playbook_pre_tasks.yml similarity index 100% rename from pre_tasks_playbook.yml rename to playbook_pre_tasks.yml diff --git a/api_integration_testing.yml b/playbook_run_api_integration_testing.yml similarity index 68% rename from api_integration_testing.yml rename to playbook_run_api_integration_testing.yml index fae9476..61648fb 100644 --- a/api_integration_testing.yml +++ b/playbook_run_api_integration_testing.yml @@ -1,7 +1,7 @@ --- -- import_playbook: pre_tasks_playbook.yml -- import_playbook: launch_instance_playbook.yml +- import_playbook: playbook_pre_tasks.yml +- import_playbook: playbook_launch_instance.yml - name: Configure Servers hosts: launched @@ -11,9 +11,6 @@ roles: - akirak.coreos-python - vars: - failed_flag: "passed" - vars_files: - "environments/{{ env }}/main.yml" # ENV must always be loaded first - "environments/shared_secrets.yml" @@ -23,13 +20,15 @@ - name: Setup Docker, Run Integration Tests block: - include_tasks: tasks/install_docker_py.yml - - include_tasks: tasks/docker_setup.yml - - include_tasks: tasks/api_integration_testing.yml + - include_tasks: tasks/setup_docker.yml + - include_tasks: tasks/run_api_integration_testing.yml + - set_fact: + failed_flag: "passed" rescue: - set_fact: failed_flag: "failed" -- import_playbook: terminate_instance_playbook.yml +- import_playbook: playbook_terminate_instance.yml - name: Check Failures hosts: launched diff --git a/playbook_run_cacher.yml b/playbook_run_cacher.yml new file mode 100644 index 0000000..f890a26 --- /dev/null +++ b/playbook_run_cacher.yml @@ -0,0 +1,41 @@ +--- + +- import_playbook: playbook_pre_tasks.yml +- import_playbook: playbook_launch_instance.yml + +- name: Configure Servers + hosts: launched + user: core + gather_facts: False + + roles: + - akirak.coreos-python + + vars_files: + - "environments/{{ env }}/main.yml" # ENV must always be loaded first + - "environments/shared_secrets.yml" + - "environments/shared_variables.yml" + + tasks: + - name: Setup Docker, Start ES, Start Neo, Run Indexer + block: + - include_tasks: tasks/install_docker_py.yml + - include_tasks: tasks/setup_docker.yml + - include_tasks: tasks/start_infinispan_env.yml + - include_tasks: tasks/start_neo_data.yml + - include_tasks: tasks/run_cacher.yml + - include_tasks: tasks/push_cacher_image.yml + - set_fact: + failed_flag: "passed" + rescue: + - set_fact: + failed_flag: "failed" + +- import_playbook: playbook_terminate_instance.yml + +- name: Check Failures + hosts: launched + gather_facts: False + tasks: + - fail: msg="The execution has failed because of errors." + when: failed_flag == "failed" diff --git a/file_gener_run.yml b/playbook_run_file_gener.yml similarity index 70% rename from file_gener_run.yml rename to playbook_run_file_gener.yml index c054b00..cea5817 100644 --- a/file_gener_run.yml +++ b/playbook_run_file_gener.yml @@ -1,7 +1,7 @@ --- -- import_playbook: pre_tasks_playbook.yml -- import_playbook: launch_instance_playbook.yml +- import_playbook: playbook_pre_tasks.yml +- import_playbook: playbook_launch_instance.yml - name: Configure Servers hosts: launched @@ -20,12 +20,12 @@ - name: Setup Docker, Start Neo, Run File Generator block: - include_tasks: tasks/install_docker_py.yml - - include_tasks: tasks/docker_setup.yml + - include_tasks: tasks/setup_docker.yml - include_tasks: tasks/start_neo_data.yml - - include_tasks: tasks/file_gener_run.yml + - include_tasks: tasks/run_file_gener.yml rescue: - debug: msg: 'Tasked Failed Terminating instances' -- import_playbook: terminate_instance_playbook.yml +- import_playbook: playbook_terminate_instance.yml diff --git a/indexer_run.yml b/playbook_run_indexer.yml similarity index 51% rename from indexer_run.yml rename to playbook_run_indexer.yml index 95ed3e8..4c82172 100644 --- a/indexer_run.yml +++ b/playbook_run_indexer.yml @@ -1,7 +1,7 @@ --- -- import_playbook: pre_tasks_playbook.yml -- import_playbook: launch_instance_playbook.yml +- import_playbook: playbook_pre_tasks.yml +- import_playbook: playbook_launch_instance.yml - name: Configure Servers hosts: launched @@ -20,13 +20,21 @@ - name: Setup Docker, Start ES, Start Neo, Run Indexer block: - include_tasks: tasks/install_docker_py.yml - - include_tasks: tasks/docker_setup.yml + - include_tasks: tasks/setup_docker.yml - include_tasks: tasks/start_es_env.yml - include_tasks: tasks/start_neo_data.yml - - include_tasks: tasks/indexer_run.yml - + - include_tasks: tasks/run_indexer.yml + - set_fact: + failed_flag: "passed" rescue: - - debug: - msg: 'Tasked Failed Terminating instances' + - set_fact: + failed_flag: "failed" + +- import_playbook: playbook_terminate_instance.yml -- import_playbook: terminate_instance_playbook.yml +- name: Check Failures + hosts: launched + gather_facts: False + tasks: + - fail: msg="The execution has failed because of errors." + when: failed_flag == "failed" diff --git a/indexer_integration_testing.yml b/playbook_run_indexer_integration_testing.yml similarity index 66% rename from indexer_integration_testing.yml rename to playbook_run_indexer_integration_testing.yml index 2dc1c61..807b696 100644 --- a/indexer_integration_testing.yml +++ b/playbook_run_indexer_integration_testing.yml @@ -1,7 +1,7 @@ --- -- import_playbook: pre_tasks_playbook.yml -- import_playbook: launch_instance_playbook.yml +- import_playbook: playbook_pre_tasks.yml +- import_playbook: playbook_launch_instance.yml - name: Configure Servers hosts: launched @@ -20,10 +20,10 @@ - name: Setup Docker, Run Integration Tests block: - include_tasks: tasks/install_docker_py.yml - - include_tasks: tasks/docker_setup.yml - - include_tasks: tasks/indexer_integration_testing.yml + - include_tasks: tasks/setup_docker.yml + - include_tasks: tasks/run_indexer_integration_testing.yml rescue: - debug: msg: 'Tasked Failed Terminating instances' -- import_playbook: terminate_instance_playbook.yml +- import_playbook: playbook_terminate_instance.yml diff --git a/loader_run.yml b/playbook_run_loader.yml similarity index 51% rename from loader_run.yml rename to playbook_run_loader.yml index 0686d76..916909d 100644 --- a/loader_run.yml +++ b/playbook_run_loader.yml @@ -1,7 +1,7 @@ --- -- import_playbook: pre_tasks_playbook.yml -- import_playbook: launch_instance_playbook.yml +- import_playbook: playbook_pre_tasks.yml +- import_playbook: playbook_launch_instance.yml - name: Configure Servers hosts: launched @@ -20,12 +20,22 @@ - name: Setup Docker, Setup Neo, Run Loader, Push Images block: - include_tasks: tasks/install_docker_py.yml - - include_tasks: tasks/docker_setup.yml + - include_tasks: tasks/setup_docker.yml - include_tasks: tasks/start_neo_env.yml - - include_tasks: tasks/loader_run.yml + - include_tasks: tasks/run_loader.yml - include_tasks: tasks/push_neo_image.yml + - set_fact: + failed_flag: "passed" + rescue: - - debug: - msg: 'Tasked Failed Terminating instances' + - set_fact: + failed_flag: "failed" + +- import_playbook: playbook_terminate_instance.yml -- import_playbook: terminate_instance_playbook.yml +- name: Check Failures + hosts: launched + gather_facts: False + tasks: + - fail: msg="The execution has failed because of errors." + when: failed_flag == "failed" diff --git a/loader_test_run.yml b/playbook_run_loader_tests.yml similarity index 69% rename from loader_test_run.yml rename to playbook_run_loader_tests.yml index fe09349..3a4cde3 100644 --- a/loader_test_run.yml +++ b/playbook_run_loader_tests.yml @@ -1,7 +1,7 @@ --- -- import_playbook: pre_tasks_playbook.yml -- import_playbook: launch_instance_playbook.yml +- import_playbook: playbook_pre_tasks.yml +- import_playbook: playbook_launch_instance.yml - name: Configure Servers hosts: launched @@ -20,12 +20,12 @@ - name: Setup Neo, Run Loader, Run Loader Tests block: - include_tasks: tasks/install_docker_py.yml - - include_tasks: tasks/docker_setup.yml + - include_tasks: tasks/setup_docker.yml - include_tasks: tasks/start_neo_env.yml - - include_tasks: tasks/loader_test_run.yml + - include_tasks: tasks/run_loader_tests.yml rescue: - debug: msg: 'Tasked Failed Terminating instances' -- import_playbook: terminate_instance_playbook.yml +- import_playbook: playbook_terminate_instance.yml diff --git a/qc_run.yml b/playbook_run_qc.yml similarity index 70% rename from qc_run.yml rename to playbook_run_qc.yml index e414e0d..3ed19be 100644 --- a/qc_run.yml +++ b/playbook_run_qc.yml @@ -1,7 +1,7 @@ --- -- import_playbook: pre_tasks_playbook.yml -- import_playbook: launch_instance_playbook.yml +- import_playbook: playbook_pre_tasks.yml +- import_playbook: playbook_launch_instance.yml - name: Configure Servers hosts: launched @@ -20,12 +20,12 @@ - name: Setup Docker, Start Neo, Run File Generator block: - include_tasks: tasks/install_docker_py.yml - - include_tasks: tasks/docker_setup.yml + - include_tasks: tasks/setup_docker.yml - include_tasks: tasks/start_neo_data.yml - - include_tasks: tasks/qc_run.yml + - include_tasks: tasks/run_qc.yml rescue: - debug: msg: 'Tasked Failed Terminating instances' -- import_playbook: terminate_instance_playbook.yml +- import_playbook: playbook_terminate_instance.yml diff --git a/terminate_instance_playbook.yml b/playbook_terminate_instance.yml similarity index 100% rename from terminate_instance_playbook.yml rename to playbook_terminate_instance.yml diff --git a/tasks/api_integration_testing.yml b/tasks/run_api_integration_testing.yml similarity index 100% rename from tasks/api_integration_testing.yml rename to tasks/run_api_integration_testing.yml diff --git a/tasks/cacher_run.yml b/tasks/run_cacher.yml similarity index 100% rename from tasks/cacher_run.yml rename to tasks/run_cacher.yml diff --git a/tasks/file_gener_run.yml b/tasks/run_file_gener.yml similarity index 100% rename from tasks/file_gener_run.yml rename to tasks/run_file_gener.yml diff --git a/tasks/indexer_run.yml b/tasks/run_indexer.yml similarity index 100% rename from tasks/indexer_run.yml rename to tasks/run_indexer.yml diff --git a/tasks/indexer_integration_testing.yml b/tasks/run_indexer_integration_testing.yml similarity index 100% rename from tasks/indexer_integration_testing.yml rename to tasks/run_indexer_integration_testing.yml diff --git a/tasks/loader_run.yml b/tasks/run_loader.yml similarity index 96% rename from tasks/loader_run.yml rename to tasks/run_loader.yml index da59e1e..9ae127a 100644 --- a/tasks/loader_run.yml +++ b/tasks/run_loader.yml @@ -7,8 +7,6 @@ name: "{{ LOADER_RUN_NAME }}" image: "{{ LOADER_RUN_IMAGE_NAME }}" detach: no - async: 7200 - poll: 15 log_driver: "gelf" log_options: gelf-address: udp://logs.alliancegenome.internal:12201 @@ -34,8 +32,6 @@ image: "{{ LOADER_RUN_IMAGE_NAME }}" command: pytest --verbose detach: no - async: 7200 - poll: 15 log_driver: "gelf" log_options: gelf-address: udp://logs.alliancegenome.internal:12201 diff --git a/tasks/loader_test_run.yml b/tasks/run_loader_tests.yml similarity index 100% rename from tasks/loader_test_run.yml rename to tasks/run_loader_tests.yml diff --git a/tasks/qc_run.yml b/tasks/run_qc.yml similarity index 100% rename from tasks/qc_run.yml rename to tasks/run_qc.yml diff --git a/tasks/docker_setup.yml b/tasks/setup_docker.yml similarity index 100% rename from tasks/docker_setup.yml rename to tasks/setup_docker.yml diff --git a/tasks/terminate_instance.yml b/tasks/terminate_instance.yml new file mode 100644 index 0000000..a7f1034 --- /dev/null +++ b/tasks/terminate_instance.yml @@ -0,0 +1,7 @@ +- name: Terminate instances + ec2: + state: 'absent' + region: us-east-1 + aws_access_key: "{{ AWS_ACCESS_KEY }}" + aws_secret_key: "{{ AWS_SECRET_KEY }}" + instance_ids: '{{ ec2.instance_ids }}'