system-tests: parameterize StorageClass names (#57)

openshift-kni · Jun 20, 2024 · 952eaeb · 952eaeb
1 parent abbd21b
commit 952eaeb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/tests/system-tests/rdscore/internal/rdscorecommon/pvc-validation.go b/tests/system-tests/rdscore/internal/rdscorecommon/pvc-validation.go
@@ -501,7 +501,7 @@ func verifyDataOnPVC(fNamespace, podLabel, verificationRegex string, cmdToRun []
 
 // DeployWorkflowCephFSPVC Verify workload with CephFS PVC.
 func DeployWorkflowCephFSPVC(ctx SpecContext) {
-	createWorkloadWithPVC("rds-cephfs-ns", "ocs-external-storagecluster-cephfs", "rds-cephfs-fs", "Filesystem")
+	createWorkloadWithPVC("rds-cephfs-ns", RDSCoreConfig.StorageCephFSSCName, "rds-cephfs-fs", "Filesystem")
 
 	verificationRegex := regexPartOne + regexPartTwo
 
@@ -512,7 +512,7 @@ func DeployWorkflowCephFSPVC(ctx SpecContext) {
 
 // VerifyCephFSPVC Verify workload with CephFS PVC.
 func VerifyCephFSPVC(ctx SpecContext) {
-	createWorkloadWithPVC("rds-cephfs-ns", "ocs-external-storagecluster-cephfs", "rds-cephfs-fs", "Filesystem")
+	createWorkloadWithPVC("rds-cephfs-ns", RDSCoreConfig.StorageCephFSSCName, "rds-cephfs-fs", "Filesystem")
 
 	verificationRegex := regexPartOne + regexPartTwo
 
@@ -527,7 +527,7 @@ func VerifyCephFSPVC(ctx SpecContext) {
 
 // DeployWorkloadCephRBDPVC Verify workload with CephRBD PVC.
 func DeployWorkloadCephRBDPVC(ctx SpecContext) {
-	createWorkloadWithPVC("rds-cephrbd-ns", "ocs-external-storagecluster-ceph-rbd", "rds-cephrbd-fs", "Filesystem")
+	createWorkloadWithPVC("rds-cephrbd-ns", RDSCoreConfig.StorageCephRBDSCName, "rds-cephrbd-fs", "Filesystem")
 
 	verificationRegex := regexPartOne + regexPartTwo
 
@@ -538,7 +538,7 @@ func DeployWorkloadCephRBDPVC(ctx SpecContext) {
 
 // VerifyCephRBDPVC Verify workload with CephRBD PVC.
 func VerifyCephRBDPVC(ctx SpecContext) {
-	createWorkloadWithPVC("rds-cephrbd-ns", "ocs-external-storagecluster-ceph-rbd", "rds-cephrbd-fs", "Filesystem")
+	createWorkloadWithPVC("rds-cephrbd-ns", RDSCoreConfig.StorageCephRBDSCName, "rds-cephrbd-fs", "Filesystem")
 
 	verificationRegex := regexPartOne + regexPartTwo
 

diff --git a/tests/system-tests/rdscore/internal/rdscoreconfig/config.go b/tests/system-tests/rdscore/internal/rdscoreconfig/config.go
@@ -303,7 +303,9 @@ type CoreConfig struct {
 	//nolint:lll,nolintlint
 	MCVlanDeplon3CMD EnvSliceString `yaml:"rdscore_mcvlan_deploy_3_cmd" envconfig:"ECO_SYSTEM_RDSCORE_MCVLAN_DEPLOY_3_CMD"`
 	//nolint:lll,nolintlint
-	MCVlanDeplon4CMD EnvSliceString `yaml:"rdscore_mcvlan_deploy_4_cmd" envconfig:"ECO_SYSTEM_RDSCORE_MCVLAN_DEPLOY_4_CMD"`
+	MCVlanDeplon4CMD     EnvSliceString `yaml:"rdscore_mcvlan_deploy_4_cmd" envconfig:"ECO_SYSTEM_RDSCORE_MCVLAN_DEPLOY_4_CMD"`
+	StorageCephFSSCName  string         `yaml:"rdscore_sc_cephfs_name" envconfig:"ECO_RDSCORE_SC_CEPHFS_NAME"`
+	StorageCephRBDSCName string         `yaml:"rdscore_sc_cephrbd_name" envconfig:"ECO_RDSCORE_SC_CEPHRBD_NAME"`
 }
 
 // NewCoreConfig returns instance of CoreConfig config type.

diff --git a/tests/system-tests/rdscore/internal/rdscoreconfig/default.yaml b/tests/system-tests/rdscore/internal/rdscoreconfig/default.yaml
@@ -96,3 +96,5 @@ rdscore_wlkd_nrop_one_res_limits:
   memory: "500M"
 rdscore_nrop_scheduler_name: topo-aware-scheduler
 rdscore_wlkd_nrop_one_selector: {}
+rdscore_sc_cephfs_name: ''
+rdscore_sc_cephrbd_name: ''