Restructure rdr (#10542)

Signed-off-by: prsurve <prsurve@redhat.com>
red-hat-storage · Oct 7, 2024 · 4bd53a2 · 4bd53a2
1 parent cc6e5c1
commit 4bd53a2
Showing 1 changed file with 47 additions and 27 deletions.
diff --git a/conf/ocsci/dr_workload.yaml b/conf/ocsci/dr_workload.yaml
@@ -2,63 +2,83 @@ ENV_DATA:
   dr_workload_repo_url: "https://github.com/red-hat-storage/ocs-workloads.git"
   dr_workload_repo_branch: "master"
   dr_workload_subscription_rbd: [
-    {name: "busybox-1", workload_dir: "rdr/busybox/app-busybox-1", pod_count: 10, pvc_count: 10},
-    {name: "busybox-2", workload_dir: "rdr/busybox/app-busybox-2", pod_count: 10, pvc_count: 10},
-    {name: "busybox-3", workload_dir: "rdr/busybox/app-busybox-3", pod_count: 20, pvc_count: 20},
-    {name: "busybox-4", workload_dir: "rdr/busybox/app-busybox-4", pod_count: 20, pvc_count: 20},
-    {name: "busybox-5", workload_dir: "rdr/busybox/app-busybox-5", pod_count: 20, pvc_count: 20},
-    {name: "busybox-6", workload_dir: "rdr/busybox/app-busybox-6", pod_count: 5, pvc_count: 5},
+    {name: "busybox-1", workload_dir: "rdr/busybox/rbd/subscription_with_placementrule/app-busybox-1",
+     pod_count: 10, pvc_count: 10
+    },
+    {name: "busybox-2", workload_dir: "rdr/busybox/rbd/subscription_with_placementrule/app-busybox-2",
+     pod_count: 10, pvc_count: 10
+    },
+    {name: "busybox-3", workload_dir: "rdr/busybox/rbd/subscription_with_placementrule/app-busybox-3",
+     pod_count: 10, pvc_count: 10
+    },
+    {name: "busybox-4", workload_dir: "rdr/busybox/rbd/subscription_with_placementrule/app-busybox-4",
+     pod_count: 10, pvc_count: 10
+    },
+    {name: "busybox-5", workload_dir: "rdr/busybox/rbd/subscription_with_placementrule/app-busybox-5",
+     pod_count: 10, pvc_count: 10
+    },
+    {name: "busybox-6", workload_dir: "rdr/busybox/rbd/subscription_with_placementrule/app-busybox-6",
+     pod_count: 10, pvc_count: 10
+    },
   ]
   dr_workload_appset_rbd: [
-    { name: "appset-busybox-1", workload_dir: "rdr/busybox/AppSet/appset-busybox-1",
+    { name: "appset-busybox-1", workload_dir: "rdr/busybox/rbd/appset/appset-busybox-1.yaml",
       dr_workload_app_placement_name: "busybox-1-placement",
       dr_workload_app_pvc_selector: {'appname': 'busybox_app1'}, pod_count: 10, pvc_count: 10
     },
-    { name: "appset-busybox-2", workload_dir: "rdr/busybox/AppSet/appset-busybox-2",
+    { name: "appset-busybox-2", workload_dir: "rdr/busybox/rbd/appset/appset-busybox-2.yaml",
       dr_workload_app_placement_name: "busybox-2-placement",
       dr_workload_app_pvc_selector: {'appname': 'busybox_app2'}, pod_count: 10, pvc_count: 10
     },
-    { name: "appset-busybox-3", workload_dir: "rdr/busybox/AppSet/appset-busybox-3",
+    { name: "appset-busybox-3", workload_dir: "rdr/busybox/rbd/appset/appset-busybox-3.yaml",
       dr_workload_app_placement_name: "busybox-3-placement",
-      dr_workload_app_pvc_selector: {'appname': 'busybox_app3'}, pod_count: 20, pvc_count: 20
+      dr_workload_app_pvc_selector: {'appname': 'busybox_app3'}, pod_count: 10, pvc_count: 10
     },
-    { name: "appset-busybox-4", workload_dir: "rdr/busybox/AppSet/appset-busybox-4",
+    { name: "appset-busybox-4", workload_dir: "rdr/busybox/rbd/appset/appset-busybox-4.yaml",
       dr_workload_app_placement_name: "busybox-4-placement",
-      dr_workload_app_pvc_selector: {'appname': 'busybox_app4'}, pod_count: 20, pvc_count: 20
+      dr_workload_app_pvc_selector: {'appname': 'busybox_app4'}, pod_count: 10, pvc_count: 10
     },
-    { name: "appset-busybox-5", workload_dir: "rdr/busybox/AppSet/appset-busybox-5",
+    { name: "appset-busybox-5", workload_dir: "rdr/busybox/rbd/appset/appset-busybox-5.yaml",
       dr_workload_app_placement_name: "busybox-5-placement",
-      dr_workload_app_pvc_selector: {'appname': 'busybox_app5'}, pod_count: 20, pvc_count: 20
+      dr_workload_app_pvc_selector: {'appname': 'busybox_app5'}, pod_count: 10, pvc_count: 10
     },
-    { name: "appset-busybox-6", workload_dir: "rdr/busybox/AppSet/appset-busybox-6",
+    { name: "appset-busybox-6", workload_dir: "rdr/busybox/rbd/appset/appset-busybox-6.yaml",
       dr_workload_app_placement_name: "busybox-6-placement",
-      dr_workload_app_pvc_selector: { 'appname': 'busybox_app6' }, pod_count: 5, pvc_count: 5
+      dr_workload_app_pvc_selector: { 'appname': 'busybox_app6' }, pod_count: 10, pvc_count: 10
     },
   ]
 
   dr_workload_subscription_cephfs: [
-    { name: "busybox-1", workload_dir: "rdr/busybox/cephfs/app-busybox-1", pod_count: 10, pvc_count: 10 },
-    { name: "busybox-2", workload_dir: "rdr/busybox/cephfs/app-busybox-2", pod_count: 8, pvc_count: 4 },
-    { name: "busybox-3", workload_dir: "rdr/busybox/cephfs/app-busybox-3", pod_count: 10, pvc_count: 10 },
-    { name: "busybox-4", workload_dir: "rdr/busybox/cephfs/app-busybox-4", pod_count: 20, pvc_count: 20 },
+    { name: "busybox-1", workload_dir: "rdr/busybox/cephfs/subscription_with_placementrule/app-busybox-1",
+      pod_count: 10, pvc_count: 10
+    },
+    { name: "busybox-2", workload_dir: "rdr/busybox/cephfs/subscription_with_placementrule/app-busybox-2",
+      pod_count: 10, pvc_count: 10
+    },
+    { name: "busybox-3", workload_dir: "rdr/busybox/cephfs/subscription_with_placementrule/app-busybox-3",
+      pod_count: 10, pvc_count: 10
+    },
+    { name: "busybox-4", workload_dir: "rdr/busybox/cephfs/subscription_with_placementrule/app-busybox-4",
+      pod_count: 10, pvc_count: 10
+    },
   ]
 
   dr_workload_appset_cephfs: [
-    { name: "appset-busybox-1", workload_dir: "rdr/busybox/cephfs/AppSet/appset-busybox-1-cephfs",
+    { name: "appset-busybox-1", workload_dir: "rdr/busybox/cephfs/appset/appset-busybox-1.yaml",
       dr_workload_app_placement_name: "busybox-1-placement-cephfs",
       dr_workload_app_pvc_selector: { 'appname': 'busybox_app1_cephfs' }, pod_count: 10, pvc_count: 10
     },
-    { name: "appset-busybox-2", workload_dir: "rdr/busybox/cephfs/AppSet/appset-busybox-2-cephfs",
+    { name: "appset-busybox-2", workload_dir: "rdr/busybox/cephfs/appset/appset-busybox-2.yaml",
       dr_workload_app_placement_name: "busybox-2-placement-cephfs",
-      dr_workload_app_pvc_selector: { 'appname': 'busybox_app2_cephfs' }, pod_count: 8, pvc_count: 4
+      dr_workload_app_pvc_selector: { 'appname': 'busybox_app2_cephfs' }, pod_count: 10, pvc_count: 10
     },
-    { name: "appset-busybox-3", workload_dir: "rdr/busybox/cephfs/AppSet/appset-busybox-3-cephfs",
+    { name: "appset-busybox-3", workload_dir: "rdr/busybox/cephfs/appset/appset-busybox-3.yaml",
       dr_workload_app_placement_name: "busybox-3-placement-cephfs",
       dr_workload_app_pvc_selector: { 'appname': 'busybox_app3_cephfs' }, pod_count: 10, pvc_count: 10
     },
-    { name: "appset-busybox-4", workload_dir: "rdr/busybox/cephfs/AppSet/appset-busybox-4-cephfs",
+    { name: "appset-busybox-4", workload_dir: "rdr/busybox/cephfs/appset/appset-busybox-4.yaml",
       dr_workload_app_placement_name: "busybox-4-placement-cephfs",
-      dr_workload_app_pvc_selector: { 'appname': 'busybox_app3_cephfs' }, pod_count: 20, pvc_count: 20
+      dr_workload_app_pvc_selector: { 'appname': 'busybox_app3_cephfs' }, pod_count: 10, pvc_count: 10
     },
   ]
 
@@ -84,7 +104,7 @@ ENV_DATA:
     },
   ]
   dr_workload_discovered_apps_rbd: [
-    { name: "busybox-dict-1", workload_dir: "rdr/busybox/app-busybox-1/resources/deployment",
+    { name: "busybox-dict-1", workload_dir: "rdr/busybox/rbd/workloads/app-busybox-1",
       pod_count: 10, pvc_count: 10,
       dr_workload_app_pod_selector_key: "workloadpattern",
       dr_workload_app_pod_selector_value: "simple_io",