Merge branch 'main' into AAP-15000_trim_docker_image

ansible · Oct 5, 2023 · e0d92e3 · e0d92e3
2 parents e7f650b + 53875da
commit e0d92e3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
@@ -31,6 +31,7 @@ jobs:
         pytest -m "e2e" -n auto'
 
   build-and-push-image:
+    needs: build-and-test-image
     if: github.repository == 'ansible/ansible-rulebook'
     runs-on: ubuntu-latest
     permissions:

diff --git a/tests/e2e/test_match_multiple_rules.py b/tests/e2e/test_match_multiple_rules.py
@@ -23,12 +23,12 @@ async def test_match_multiple_rules():
     and send the event messages to a websocket server
     """
     # variables
-    host = "localhost"
+    host = "127.0.0.1"
     endpoint = "/api/ws2"
     proc_id = "42"
     port = 31415
     rulebook = utils.BASE_DATA_PATH / "rulebooks/test_match_multiple_rules.yml"
-    websocket_address = f"ws://localhost:{port}{endpoint}"
+    websocket_address = f"ws://127.0.0.1:{port}{endpoint}"
     cmd = utils.Command(
         rulebook=rulebook,
         websocket=websocket_address,

diff --git a/tests/e2e/test_non_alpha_keys.py b/tests/e2e/test_non_alpha_keys.py
@@ -23,12 +23,12 @@ async def test_non_alpha_numeric_keys():
     and send the event messages to a websocket server
     """
     # variables
-    host = "localhost"
+    host = "127.0.0.1"
     endpoint = "/api/ws2"
     proc_id = "42"
     port = 31415
     rulebook = utils.EXAMPLES_PATH / "82_non_alpha_keys.yml"
-    websocket_address = f"ws://localhost:{port}{endpoint}"
+    websocket_address = f"ws://127.0.0.1:{port}{endpoint}"
     cmd = utils.Command(
         rulebook=rulebook,
         websocket=websocket_address,

diff --git a/tests/e2e/test_run_module_output.py b/tests/e2e/test_run_module_output.py
@@ -23,12 +23,12 @@ async def test_run_module_output():
     run_module and then used in a condition
     """
     # variables
-    host = "localhost"
+    host = "127.0.0.1"
     endpoint = "/api/ws2"
     proc_id = "42"
     port = 31415
     rulebook = utils.EXAMPLES_PATH / "29_run_module.yml"
-    websocket_address = f"ws://localhost:{port}{endpoint}"
+    websocket_address = f"ws://127.0.0.1:{port}{endpoint}"
     cmd = utils.Command(
         rulebook=rulebook,
         websocket=websocket_address,

diff --git a/tests/e2e/test_websocket.py b/tests/e2e/test_websocket.py
@@ -22,14 +22,14 @@ async def test_websocket_messages():
     send event messages to a websocket server
     """
     # variables
-    host = "localhost"
+    host = "127.0.0.1"
     endpoint = "/api/ws2"
     proc_id = "42"
     port = 31415
     rulebook = (
         utils.BASE_DATA_PATH / "rulebooks/websockets/test_websocket_range.yml"
     )
-    websocket_address = f"ws://localhost:{port}{endpoint}"
+    websocket_address = f"ws://127.0.0.1:{port}{endpoint}"
     cmd = utils.Command(
         rulebook=rulebook,
         websocket=websocket_address,