mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-19 19:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #418 from humblec/e2e

Browse Source 
Combine the variable section in e2e and also introuce new vars.
This commit is contained in:
Humble Devassy Chirammal 2019-06-10 14:10:24 +05:30 committed by GitHub
commit 5753325970
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
e2e/cephfs.go
View File

@ -11,11 +11,9 @@ var (
cephfsProvisionerRBAC = "csi-provisioner-rbac.yaml" cephfsProvisionerRBAC = "csi-provisioner-rbac.yaml"
cephfsNodePlugin = "csi-cephfsplugin.yaml" cephfsNodePlugin = "csi-cephfsplugin.yaml"
cephfsNodePluginRBAC = "csi-nodeplugin-rbac.yaml" cephfsNodePluginRBAC = "csi-nodeplugin-rbac.yaml"
) cephfsDeploymentName = "csi-cephfsplugin-provisioner"
cephfsDeamonSetName = "csi-cephfsplugin"
var (
cephfsDirPath = "../deploy/cephfs/kubernetes/" cephfsDirPath = "../deploy/cephfs/kubernetes/"
cephfsExamplePath = "../examples/cephfs/" cephfsExamplePath = "../examples/cephfs/"
) )
@ -53,13 +51,13 @@ var _ = Describe("cephfs", func() {
Context("Test cephfs CSI", func() { Context("Test cephfs CSI", func() {
It("Test cephfs CSI", func() { It("Test cephfs CSI", func() {
By("checking provisioner deployment is completed") By("checking provisioner deployment is completed")
err := waitForDeploymentComplete("csi-cephfsplugin-provisioner", "default", f.ClientSet, deployTimeout) err := waitForDeploymentComplete(cephfsDeploymentName, namespace, f.ClientSet, deployTimeout)
if err != nil { if err != nil {
Fail(err.Error()) Fail(err.Error())
} }
By("checking nodeplugin deamonsets is running") By("checking nodeplugin deamonsets is running")
err = waitForDaemonSets("csi-cephfsplugin", "default", f.ClientSet, deployTimeout) err = waitForDaemonSets(cephfsDeamonSetName, namespace, f.ClientSet, deployTimeout)
if err != nil { if err != nil {
Fail(err.Error()) Fail(err.Error())
} }

11
e2e/rbd.go
View File

@ -12,12 +12,11 @@ var (
rbdNodePlugin = "csi-rbdplugin.yaml" rbdNodePlugin = "csi-rbdplugin.yaml"
rbdNodePluginRBAC = "csi-nodeplugin-rbac.yaml" rbdNodePluginRBAC = "csi-nodeplugin-rbac.yaml"
rbdConfigMap = "csi-config-map.yaml" rbdConfigMap = "csi-config-map.yaml"
)
var (
rbdDirPath = "../deploy/rbd/kubernetes/" rbdDirPath = "../deploy/rbd/kubernetes/"
rbdExamplePath = "../examples/rbd/" rbdExamplePath = "../examples/rbd/"
rbdDeploymentName = "csi-rbdplugin-provisioner"
rbdDaemonsetName = "csi-rbdplugin"
namespace = "default"
) )
func deployRBDPlugin() { func deployRBDPlugin() {
@ -54,13 +53,13 @@ var _ = Describe("RBD", func() {
Context("Test RBD CSI", func() { Context("Test RBD CSI", func() {
It("Test RBD CSI", func() { It("Test RBD CSI", func() {
By("checking provisioner deployment is completed") By("checking provisioner deployment is completed")
err := waitForDeploymentComplete("csi-rbdplugin-provisioner", "default", f.ClientSet, deployTimeout) err := waitForDeploymentComplete(rbdDeploymentName, namespace, f.ClientSet, deployTimeout)
if err != nil { if err != nil {
Fail(err.Error()) Fail(err.Error())
} }
By("checking nodeplugin deamonsets is running") By("checking nodeplugin deamonsets is running")
err = waitForDaemonSets("csi-rbdplugin", "default", f.ClientSet, deployTimeout) err = waitForDaemonSets(rbdDaemonsetName, namespace, f.ClientSet, deployTimeout)
if err != nil { if err != nil {
Fail(err.Error()) Fail(err.Error())
} }