From a9b836272a38a242fd3a708415d1b3fb2fa2c517 Mon Sep 17 00:00:00 2001
From: Igor Sudak <isudak@cloudlinux.com>
Date: Sun, 23 Jun 2024 21:57:29 +0000
Subject: [PATCH] Adding test_db and web_server_tests services to
 excluded_containers

Also, removing redefinition of excluded_containers from playbooks/
and get the varible from inventories/.../group_vars/all.yml files.

Resolves: AlmaLinux/build-system/issues/311
---
 inventories/one_vm/group_vars/all.yml              | 5 ++++-
 inventories/separate_build_node/group_vars/all.yml | 5 ++++-
 inventories/separate_sign_node/group_vars/all.yml  | 5 ++++-
 playbooks/albs_with_separate_build_node.yml        | 3 ---
 playbooks/albs_with_separate_sign_node.yml         | 3 ---
 roles/dev_deploy/tasks/services.yml                | 2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/inventories/one_vm/group_vars/all.yml b/inventories/one_vm/group_vars/all.yml
index 0a3a54d..1c88e39 100644
--- a/inventories/one_vm/group_vars/all.yml
+++ b/inventories/one_vm/group_vars/all.yml
@@ -53,5 +53,8 @@ beholder_enabled: false
 nvm_version: "v0.39.3"
 node_version: "16"
 
-excluded_containers: ""
+excluded_containers:
+  - "test_db"
+  - "web_server_tests"
+
 ...
diff --git a/inventories/separate_build_node/group_vars/all.yml b/inventories/separate_build_node/group_vars/all.yml
index 1dcb3b1..b8893d0 100644
--- a/inventories/separate_build_node/group_vars/all.yml
+++ b/inventories/separate_build_node/group_vars/all.yml
@@ -32,6 +32,9 @@ rabbitmq_vhost: "{{ rabbitmq_vhost }}"
 
 pulp_password: "{{ pulp_password }}"
 
-excluded_containers: ""
+excluded_containers:
+  - "test_db"
+  - "web_server_tests"
+  - "build_node"
 
 ...
diff --git a/inventories/separate_sign_node/group_vars/all.yml b/inventories/separate_sign_node/group_vars/all.yml
index a298608..fde7566 100644
--- a/inventories/separate_sign_node/group_vars/all.yml
+++ b/inventories/separate_sign_node/group_vars/all.yml
@@ -34,6 +34,9 @@ beholder_enabled: false
 nvm_version: "v0.39.3"
 node_version: "16"
 
-excluded_containers: ""
+excluded_containers:
+  - "test_db"
+  - "web_server_tests"
+  - "sign_node"
 
 ...
diff --git a/playbooks/albs_with_separate_build_node.yml b/playbooks/albs_with_separate_build_node.yml
index c83b2e5..3d65978 100644
--- a/playbooks/albs_with_separate_build_node.yml
+++ b/playbooks/albs_with_separate_build_node.yml
@@ -1,9 +1,6 @@
 ---
 - name: Deploy the ALBS
   hosts: albs_vm
-  vars:
-    - excluded_containers:
-        - "build_node"
   roles:
     - dev_deploy
   tags:
diff --git a/playbooks/albs_with_separate_sign_node.yml b/playbooks/albs_with_separate_sign_node.yml
index 975b705..50697a1 100644
--- a/playbooks/albs_with_separate_sign_node.yml
+++ b/playbooks/albs_with_separate_sign_node.yml
@@ -1,9 +1,6 @@
 ---
 - name: Deploy the ALBS
   hosts: albs_vm
-  vars:
-    - excluded_containers:
-        - "sign_node"
   roles:
     - dev_deploy
   tags:
diff --git a/roles/dev_deploy/tasks/services.yml b/roles/dev_deploy/tasks/services.yml
index 3ebee1d..6d6d9d9 100644
--- a/roles/dev_deploy/tasks/services.yml
+++ b/roles/dev_deploy/tasks/services.yml
@@ -47,7 +47,7 @@
   register: output
   when:
     - docker_compose != "not found"
-    - not excluded_containers or excluded_containers == ""
+    - not excluded_containers
 
 - debug:
     var: output