From e84cab82869d29886e73eaec98ca35ac6fc4a1f9 Mon Sep 17 00:00:00 2001
From: Tomaz Muraus <tomaz@tomaz.me>
Date: Thu, 2 Nov 2017 13:10:20 +0100
Subject: [PATCH] Run test_quickstart_key_triggers tests in sequential manner.

Previously they ran in parallel with python quickstart and some other
tests which caused occasional failure because there is a race between
key_triggers and python tests.
---
 actions/workflows/st2_e2e_tests.yaml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/actions/workflows/st2_e2e_tests.yaml b/actions/workflows/st2_e2e_tests.yaml
index a2e28392..01afddad 100644
--- a/actions/workflows/st2_e2e_tests.yaml
+++ b/actions/workflows/st2_e2e_tests.yaml
@@ -246,7 +246,6 @@ workflows:
                     timeout: 600
                 on-success:
                     - test_quickstart_python
-                    - test_quickstart_key_triggers
                     - test_quickstart_trace
                     - test_quickstart_run_pack_tests_tool
             test_quickstart_python:
@@ -258,15 +257,6 @@ workflows:
                     timeout: 600
                 # on-success:
                 #     - test_quickstart_key_triggers
-            test_quickstart_key_triggers:
-                action: core.remote
-                input:
-                    hosts: <% $.host %>
-                    env: <% $.env %>
-                    cmd: st2 run tests.test_key_triggers <% $.st2_cli_args %>
-                    timeout: 600
-                # on-success:
-                #    - test_quickstart_trace
             test_quickstart_trace:
                 action: core.remote
                 input:
@@ -284,8 +274,19 @@ workflows:
                     # Note: This test is only available and working in StackStorm >= 2.3dev
                     cmd: "st2 action get tests.test_run_pack_tests_tool ; if [ $? -eq 0 ]; then st2 run tests.test_run_pack_tests_tool <% $.st2_cli_args %>; else echo 'run_pack_tests_tool tests not available'; fi"
                     timeout: 600
-                # Keep timer_rules sequential
+                # Keep key_triggers and timer_rules tests sequential.
+                # test_quickstart_key_triggers conflicts with test_quickstart_python (race) so
+                # they can't run at the same time.
                 on-success:
+                    - test_quickstart_key_triggers
+            test_quickstart_key_triggers:
+                action: core.remote
+                input:
+                    hosts: <% $.host %>
+                    env: <% $.env %>
+                    cmd: st2 run tests.test_key_triggers <% $.st2_cli_args %>
+                    timeout: 600
+                 on-success:
                     - test_quickstart_timer_rules
             test_quickstart_timer_rules:
                 action: core.remote
@@ -295,7 +296,6 @@ workflows:
                     cmd: st2 run tests.test_timer_rule <% $.st2_cli_args %>
                     timeout: 600
 
-
     test_mistral:
         type: direct
         input: