Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

system-tests: parameterize StorageClass names #57

Merged
merged 1 commit into from
Jun 20, 2024
Merged

system-tests: parameterize StorageClass names #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tests/system-tests/rdscore/internal/rdscorecommon/pvc-validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down
4 changes: 3 additions & 1 deletion tests/system-tests/rdscore/internal/rdscoreconfig/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions tests/system-tests/rdscore/internal/rdscoreconfig/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ''
Loading