Refactored naming most files

alliance-genome · Jan 31, 2020 · 82cb053 · 82cb053
1 parent 04528ad
commit 82cb053
Show file tree

Hide file tree

Showing 23 changed files with 110 additions and 82 deletions.
diff --git a/cacher_run.yml b/cacher_run.yml
diff --git 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 }}'
+#        instance_ids: '{{ ec2.instance_ids }}'
diff --git a/launch_instance_playbook.yml → playbook_launch_instance.yml b/launch_instance_playbook.yml → playbook_launch_instance.yml
diff --git a/pre_tasks_playbook.yml → playbook_pre_tasks.yml b/pre_tasks_playbook.yml → playbook_pre_tasks.yml
diff --git a/api_integration_testing.yml → playbook_run_api_integration_testing.yml b/api_integration_testing.yml → 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
@@ -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 → playbook_run_file_gener.yml b/file_gener_run.yml → 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 → playbook_run_indexer.yml b/indexer_run.yml → 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 → playbook_run_indexer_integration_testing.yml b/indexer_integration_testing.yml → 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 → playbook_run_loader.yml b/loader_run.yml → 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 → playbook_run_loader_tests.yml b/loader_test_run.yml → 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 → playbook_run_qc.yml b/qc_run.yml → 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 → playbook_terminate_instance.yml b/terminate_instance_playbook.yml → playbook_terminate_instance.yml
diff --git a/tasks/api_integration_testing.yml → tasks/run_api_integration_testing.yml b/tasks/api_integration_testing.yml → tasks/run_api_integration_testing.yml
diff --git a/tasks/cacher_run.yml → tasks/run_cacher.yml b/tasks/cacher_run.yml → tasks/run_cacher.yml
diff --git a/tasks/file_gener_run.yml → tasks/run_file_gener.yml b/tasks/file_gener_run.yml → tasks/run_file_gener.yml
diff --git a/tasks/indexer_run.yml → tasks/run_indexer.yml b/tasks/indexer_run.yml → tasks/run_indexer.yml
diff --git a/tasks/indexer_integration_testing.yml → tasks/run_indexer_integration_testing.yml b/tasks/indexer_integration_testing.yml → tasks/run_indexer_integration_testing.yml
diff --git a/tasks/loader_run.yml → tasks/run_loader.yml b/tasks/loader_run.yml → 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 → tasks/run_loader_tests.yml b/tasks/loader_test_run.yml → tasks/run_loader_tests.yml
diff --git a/tasks/qc_run.yml → tasks/run_qc.yml b/tasks/qc_run.yml → tasks/run_qc.yml
diff --git a/tasks/docker_setup.yml → tasks/setup_docker.yml b/tasks/docker_setup.yml → tasks/setup_docker.yml
diff --git a/tasks/terminate_instance.yml 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 }}'