From 8cbce442c80e676ee910fb4647331c93e4a95bde Mon Sep 17 00:00:00 2001
From: Andrea V <1577639+karimodm@users.noreply.github.com>
Date: Mon, 4 Dec 2023 09:16:37 +0100
Subject: [PATCH 1/2] Make Feature network kill and down more reliable

---
 deploy/ansible/roles/iota-core-node/tasks/main.yml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/deploy/ansible/roles/iota-core-node/tasks/main.yml b/deploy/ansible/roles/iota-core-node/tasks/main.yml
index 6cb8422be..e3af41031 100644
--- a/deploy/ansible/roles/iota-core-node/tasks/main.yml
+++ b/deploy/ansible/roles/iota-core-node/tasks/main.yml
@@ -27,17 +27,14 @@
     dest: /opt/iota-core/docker-compose.yml
     mode: '0644'
 
-- name: Kill existing services
-  community.docker.docker_compose:
-    project_src: /opt/iota-core
-    timeout: 1
-    state: present
-    stopped: yes
-
-- name: Tear down existing services
+- name: Kill & teardown existing services
   community.docker.docker_compose:
     project_src: /opt/iota-core
+    timeout: 5
     state: absent
+    stopped: true
+    remove_orphans: true
+    remove_volumes: true
 
 - name: Create DB directory
   file:

From 10d32906d7a6d565477d453dff46204e65c0b4b4 Mon Sep 17 00:00:00 2001
From: Andrea V <1577639+karimodm@users.noreply.github.com>
Date: Mon, 4 Dec 2023 09:46:03 +0100
Subject: [PATCH 2/2] Do not allow parallel deployments

---
 .github/workflows/feature-network-deploy.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/feature-network-deploy.yml b/.github/workflows/feature-network-deploy.yml
index 3a09e46d1..7192e697e 100644
--- a/.github/workflows/feature-network-deploy.yml
+++ b/.github/workflows/feature-network-deploy.yml
@@ -10,6 +10,10 @@ on:
         required: false
         default: ""
 
+concurrency:
+  group: feature-network-deploy-group
+  cancel-in-progress: false
+
 jobs:
   deploy:
     environment: feature