From 60bb3f2c21eae78079eff1f8c19194061be0be0c Mon Sep 17 00:00:00 2001 From: prsurve Date: Fri, 20 Sep 2024 20:11:50 +0530 Subject: [PATCH 1/3] Restructure RDR Signed-off-by: prsurve --- conf/ocsci/dr_workload.yaml | 74 +++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 27 deletions(-) diff --git a/conf/ocsci/dr_workload.yaml b/conf/ocsci/dr_workload.yaml index a4b5154c1ec..52c190d429a 100644 --- 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", From e7e5d2cb18665402223c29b6d49f19ef95555337 Mon Sep 17 00:00:00 2001 From: prsurve Date: Thu, 26 Sep 2024 20:06:09 +0530 Subject: [PATCH 2/3] Restructure RDR Signed-off-by: prsurve --- conf/ocsci/dr_workload.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/ocsci/dr_workload.yaml b/conf/ocsci/dr_workload.yaml index 52c190d429a..8faf7882548 100644 --- a/conf/ocsci/dr_workload.yaml +++ b/conf/ocsci/dr_workload.yaml @@ -1,6 +1,6 @@ ENV_DATA: - dr_workload_repo_url: "https://github.com/red-hat-storage/ocs-workloads.git" - dr_workload_repo_branch: "master" + dr_workload_repo_url: "https://github.com/prsurve/ocs-workloads.git" + dr_workload_repo_branch: "restructure_rdr" dr_workload_subscription_rbd: [ {name: "busybox-1", workload_dir: "rdr/busybox/rbd/subscription_with_placementrule/app-busybox-1", pod_count: 10, pvc_count: 10 From c5fe22b2f16c81fffbcff62e98a80178546dbb7d Mon Sep 17 00:00:00 2001 From: prsurve Date: Thu, 26 Sep 2024 20:07:21 +0530 Subject: [PATCH 3/3] Restructure RDR Signed-off-by: prsurve --- conf/ocsci/dr_workload.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/ocsci/dr_workload.yaml b/conf/ocsci/dr_workload.yaml index 8faf7882548..52c190d429a 100644 --- a/conf/ocsci/dr_workload.yaml +++ b/conf/ocsci/dr_workload.yaml @@ -1,6 +1,6 @@ ENV_DATA: - dr_workload_repo_url: "https://github.com/prsurve/ocs-workloads.git" - dr_workload_repo_branch: "restructure_rdr" + 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/rbd/subscription_with_placementrule/app-busybox-1", pod_count: 10, pvc_count: 10