e2e: wait for upgraded pods to be running during upgrade-tests

This commit calls `waitForDaemonSets` and `waitForDeploymentComplete`
after upgrading to wait for csi driver pods to be in running state
for both rbd and cephfs upgrade tests.

Signed-off-by: Rakshith R <rar@redhat.com>
This commit is contained in:
Rakshith R 2021-05-17 15:28:15 +05:30 committed by mergify[bot]
parent 6984da5096
commit 81809500be
2 changed files with 21 additions and 0 deletions

View File

@ -234,6 +234,16 @@ var _ = Describe("CephFS Upgrade Testing", func() {
} }
deployCephfsPlugin() deployCephfsPlugin()
err = waitForDeploymentComplete(cephfsDeploymentName, cephCSINamespace, f.ClientSet, deployTimeout)
if err != nil {
e2elog.Failf("timeout waiting for upgraded deployment %s with error %v", cephfsDeploymentName, err)
}
err = waitForDaemonSets(cephfsDeamonSetName, cephCSINamespace, f.ClientSet, deployTimeout)
if err != nil {
e2elog.Failf("timeout waiting for upgraded daemonset %s with error %v", cephfsDeamonSetName, err)
}
app.Labels = label app.Labels = label
// validate if the app gets bound to a pvc created by // validate if the app gets bound to a pvc created by
// an earlier release. // an earlier release.

View File

@ -251,6 +251,17 @@ var _ = Describe("RBD Upgrade Testing", func() {
} }
deployRBDPlugin() deployRBDPlugin()
err = waitForDeploymentComplete(rbdDeploymentName, cephCSINamespace, f.ClientSet, deployTimeout)
if err != nil {
e2elog.Failf("timeout waiting for upgraded deployment %s with error %v", rbdDeploymentName, err)
}
err = waitForDaemonSets(rbdDaemonsetName, cephCSINamespace, f.ClientSet, deployTimeout)
if err != nil {
e2elog.Failf("timeout waiting for upgraded daemonset %s with error %v", rbdDaemonsetName, err)
}
// validate if the app gets bound to a pvc created by // validate if the app gets bound to a pvc created by
// an earlier release. // an earlier release.
app.Labels = label app.Labels = label