@@ -46,7 +46,7 @@ var _ = Describe("Boot volume tests", func() {
4646 opts := framework.Options {
4747 BlockProvisionerName : setupF .BlockProvisionerName ,
4848 }
49- pvc , bootvolumeId := pvcJig .CreateAndAwaitStaticBootVolumePVCOrFailCSI (f .ComputeClient , f .Namespace .Name , compartmentId , setupF .AdLocation , setupF . MntTargetSubnetOcid , framework .MinVolumeBlock , scName , nil , v1 .PersistentVolumeBlock , v1 .ReadWriteOnce , v1 .ClaimPending , opts )
49+ pvc , bootvolumeId := pvcJig .CreateAndAwaitStaticBootVolumePVCOrFailCSI (f .ComputeClient , f .BlockStorageClient , f . Namespace .Name , compartmentId , setupF .AdLocation , framework .MinVolumeBlock , scName , nil , v1 .PersistentVolumeBlock , v1 .ReadWriteOnce , v1 .ClaimPending , opts )
5050 f .VolumeIds = append (f .VolumeIds , pvc .Spec .VolumeName )
5151
5252 podName := pvcJig .NewPodForCSI ("app1" , f .Namespace .Name , pvc .Name , setupF .AdLabel , v1 .PersistentVolumeBlock )
@@ -74,13 +74,10 @@ var _ = Describe("Boot volume gating test", func() {
7474 framework .Failf ("Compartment Id undefined." )
7575 }
7676
77- scName := f .CreateStorageClassOrFail (f .Namespace .Name , setupF . BlockProvisionerName ,
77+ scName := f .CreateStorageClassOrFail (f .Namespace .Name , "blockvolume.csi.oraclecloud.com" ,
7878 map [string ]string {framework .AttachmentType : framework .AttachmentTypeISCSI },
7979 pvcJig .Labels , "WaitForFirstConsumer" , false , "Retain" , nil )
80- opts := framework.Options {
81- BlockProvisionerName : setupF .BlockProvisionerName ,
82- }
83- pvc , bootvolumeId := pvcJig .CreateAndAwaitStaticBootVolumePVCOrFailCSI (f .ComputeClient , f .Namespace .Name , compartmentId , setupF .AdLocation , setupF .MntTargetSubnetOcid , framework .MinVolumeBlock , scName , nil , v1 .PersistentVolumeFilesystem , v1 .ReadWriteOnce , v1 .ClaimPending , opts )
80+ pvc , bootvolumeId := pvcJig .CreateAndAwaitStaticBootVolumePVCOrFailCSI (f .ComputeClient , f .BlockStorageClient , f .Namespace .Name , compartmentId , setupF .AdLocation , framework .MinVolumeBlock , scName , nil , v1 .PersistentVolumeFilesystem , v1 .ReadWriteOnce , v1 .ClaimPending )
8481 pvcJig .NewPodForCSIWithoutWait ("app1" , f .Namespace .Name , pvc .Name , setupF .AdLabel )
8582 err := pvcJig .WaitTimeoutForPodRunningInNamespace ("app1" , f .Namespace .Name , 7 * time .Minute )
8683 if err == nil {
0 commit comments