From d2a28eb0561b5c7a3f617b0ac3c8ea032266785c Mon Sep 17 00:00:00 2001
From: Fabricio Aguiar <fabricio.aguiar@gmail.com>
Date: Mon, 28 Oct 2024 12:24:10 +0000
Subject: [PATCH] Refactor tempest job

Signed-off-by: Fabricio Aguiar <fabricio.aguiar@gmail.com>
---
 ci/tempest/ci_fw_vars.yaml         | 28 ++++++++++++++++------------
 ci/tempest/control_plane_hook.yaml | 26 --------------------------
 2 files changed, 16 insertions(+), 38 deletions(-)
 delete mode 100644 ci/tempest/control_plane_hook.yaml

diff --git a/ci/tempest/ci_fw_vars.yaml b/ci/tempest/ci_fw_vars.yaml
index 73b00909..7928e4f1 100644
--- a/ci/tempest/ci_fw_vars.yaml
+++ b/ci/tempest/ci_fw_vars.yaml
@@ -1,13 +1,17 @@
 ---
-# note by default the source for the playbook specified
-# in the hooks is relative to
-# https://github.com/openstack-k8s-operators/ci-framework/tree/main/hooks/playbooks
-# if you want to use a different source you can use the full path on the ansible controller
-
-post_ctlplane_deploy:
-  - name: 71 Kustomize control plane to enable heat service
-    type: playbook
-    source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/heat-operator'].src_dir }}/ci/tempest/control_plane_hook.yaml"
-  - name: 82 Kustomize and update Control Plane
-    type: playbook
-    source: control_plane_kustomize_deploy.yml
+cifmw_edpm_prepare_timeout: 60
+cifmw_edpm_prepare_kustomizations:
+  - apiVersion: kustomize.config.k8s.io/v1beta1
+    kind: Kustomization
+    namespace: openstack
+    patches:
+    - patch: |-
+        apiVersion: core.openstack.org/v1beta1
+        kind: OpenStackControlPlane
+        metadata:
+          name: unused
+        spec:
+          heat:
+            enabled: true
+      target:
+        kind: OpenStackControlPlane
diff --git a/ci/tempest/control_plane_hook.yaml b/ci/tempest/control_plane_hook.yaml
deleted file mode 100644
index e196cd9d..00000000
--- a/ci/tempest/control_plane_hook.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- name: Kustomize ControlPlane
-  hosts: "{{ cifmw_target_hook_host | default('localhost') }}"
-  gather_facts: false
-  tasks:
-    - name: Ensure the kustomizations dir exists
-      ansible.builtin.file:
-        path: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane"
-        state: directory
-        mode: "0755"
-
-    - name: Create kustomization
-      ansible.builtin.copy:
-        dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/71-controlplane-kustomization.yaml"
-        content: |-
-          apiVersion: kustomize.config.k8s.io/v1beta1
-          kind: Kustomization
-          resources:
-          namespace: {{ cifmw_install_yamls_defaults['NAMESPACE'] }}
-          patches:
-          - target:
-              kind: OpenStackControlPlane
-            patch: |-
-              - op: replace
-                path: /spec/heat/enabled
-                value: true