From cd14dc4382037d1fa8918d7c0c45f613f714fbd4 Mon Sep 17 00:00:00 2001
From: Brian <brjackma@redhat.com>
Date: Thu, 18 Sep 2025 10:54:03 +0100
Subject: [PATCH 1/3] Testing testImportToInclude functionality

---
 deploy-edpm.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/deploy-edpm.yml b/deploy-edpm.yml
index eee017477d..e155da7a88 100644
--- a/deploy-edpm.yml
+++ b/deploy-edpm.yml
@@ -166,6 +166,10 @@
         tasks_from: deploy_architecture.yml
       tags:
         - edpm
+    
+    - name: Print debug message
+      ansible.builtin.debug:
+        msg: "Here is a debug message"
 
     - name: Run validations
       ansible.builtin.include_role:

From 92377e5fac9cf6bc1176536dc888a44cb98d3bb1 Mon Sep 17 00:00:00 2001
From: Brian <brjackma@redhat.com>
Date: Thu, 18 Sep 2025 13:12:14 +0100
Subject: [PATCH 2/3] updating the tasks to use include role syntax changing
 import role to include role

---
 deploy-edpm.yml | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/deploy-edpm.yml b/deploy-edpm.yml
index e155da7a88..62c72254a9 100644
--- a/deploy-edpm.yml
+++ b/deploy-edpm.yml
@@ -19,14 +19,14 @@
         file: "ci/playbooks/tasks/inherit_parent_scenario.yml"
 
     - name: Run bootstrap
-      ansible.builtin.import_role:
+      ansible.builtin.include_role:
         name: cifmw_setup
         tasks_from: bootstrap.yml
 
     - name: Run pre_infra hooks
       vars:
         step: pre_infra
-      ansible.builtin.import_role:
+      ansible.builtin.include_role:
         name: run_hook
       tags:
         - infra
@@ -37,7 +37,7 @@
     - name: Run prepare host virtualization
       vars:
         step: pre_infra
-      ansible.builtin.import_role:
+      ansible.builtin.include_role:
         name: cifmw_setup
         tasks_from: host_virtualization.yml
       tags:
@@ -49,37 +49,38 @@
     - name: Prepare the platform
       vars:
         step: pre_infra
-      ansible.builtin.import_role:
+      ansible.builtin.include_role:
         name: cifmw_setup
         tasks_from: infra.yml
       tags:
         - infra
 
     - name: Build package playbook
-      ansible.builtin.import_role:
+      ansible.builtin.include_role:
         name: cifmw_setup
         tasks_from: build_packages.yml
       tags:
         - build-packages
 
     - name: Build container playbook
-      ansible.builtin.import_role:
+      ansible.builtin.include_role:
         name: cifmw_setup
         tasks_from: build_containers.yml
       tags:
         - build-containers
 
     - name: Build operators playbook
-      ansible.builtin.import_role:
+      ansible.builtin.include_role:
         name: cifmw_setup
         tasks_from: build_operators.yml
+      apply:
+        environment:
+          PATH: "{{ cifmw_path }}"
       tags:
         - build-operators
-      environment:
-        PATH: "{{ cifmw_path }}"
 
     - name: Deploy EDPM
-      ansible.builtin.import_role:
+      ansible.builtin.include_role:
         name: cifmw_setup
         tasks_from: deploy_edpm.yml
       tags:
@@ -95,7 +96,7 @@
         nftables_conf: /etc/sysconfig/nftables.conf
       when:
         - cifmw_edpm_deploy_nfs | default(false) | bool
-      ansible.builtin.import_role:
+      ansible.builtin.include_role:
         name: cifmw_nfs
 
 - name: Clear ceph target hosts facts to force refreshing in HCI deployments
@@ -124,7 +125,7 @@
           }}
         storage_network_range: 172.18.0.0/24
         storage_mgmt_network_range: 172.20.0.0/24
-      ansible.builtin.import_role:
+      ansible.builtin.include_role:
         name: run_hook
 
 - name: Continue HCI deploy, deploy architecture and validate workflow
@@ -132,7 +133,7 @@
   gather_facts: false
   tasks:
     - name: Continue HCI deploy
-      ansible.builtin.import_role:
+      ansible.builtin.include_role:
         name: cifmw_setup
         tasks_from: hci_deploy.yml
       tags:
@@ -142,7 +143,7 @@
       when: cifmw_architecture_scenario is defined
       vars:
         step: pre_deploy
-      ansible.builtin.import_role:
+      ansible.builtin.include_role:
         name: run_hook
 
     # FIXME:Earlier, where we were using import_playbook, the cifmw_architecture_scenario
@@ -161,7 +162,7 @@
 
     - name: Run cifmw_setup deploy_architecture
       when: cifmw_architecture_scenario is defined
-      ansible.builtin.import_role:
+      ansible.builtin.include_role:
         name: cifmw_setup
         tasks_from: deploy_architecture.yml
       tags:

From 3285e659327a47f717aff48edfd3027064c26bf2 Mon Sep 17 00:00:00 2001
From: Brian <brjackma@redhat.com>
Date: Thu, 18 Sep 2025 14:31:10 +0100
Subject: [PATCH 3/3] Edit how the environment variables are added

---
 deploy-edpm.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/deploy-edpm.yml b/deploy-edpm.yml
index 62c72254a9..86fd0ec8cb 100644
--- a/deploy-edpm.yml
+++ b/deploy-edpm.yml
@@ -73,9 +73,9 @@
       ansible.builtin.include_role:
         name: cifmw_setup
         tasks_from: build_operators.yml
-      apply:
-        environment:
-          PATH: "{{ cifmw_path }}"
+        apply:
+          environment:
+            PATH: "{{ cifmw_path }}"
       tags:
         - build-operators