Enhance e2e test

1. Check the error when waiting for restice daemonset to be ready, so
   the timeout will be reported
2. Add support for gcp provider and fail early if the provider is
   unknown

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
This commit is contained in:
Daniel Jiang
2021-08-31 21:01:21 +08:00
parent 7c75cd6cf8
commit 70a8a5d54d
2 changed files with 7 additions and 2 deletions
+4 -1
View File
@@ -280,7 +280,7 @@ func waitVeleroReady(ctx context.Context, namespace string, useRestic bool) erro
if useRestic {
fmt.Println("Waiting for Velero restic daemonset to be ready.")
wait.PollImmediate(5*time.Second, 1*time.Minute, func() (bool, error) {
err := wait.PollImmediate(5*time.Second, 1*time.Minute, func() (bool, error) {
stdout, stderr, err := velerexec.RunCommand(exec.CommandContext(ctx, "kubectl", "get", "daemonset/restic",
"-o", "json", "-n", namespace))
if err != nil {
@@ -295,6 +295,9 @@ func waitVeleroReady(ctx context.Context, namespace string, useRestic bool) erro
}
return false, nil
})
if err != nil {
return errors.Wrap(err, "fail to wait for the velero restic ready")
}
}
fmt.Printf("Velero is installed and ready to be tested in the %s namespace! ⛵ \n", namespace)
+3 -1
View File
@@ -46,8 +46,10 @@ func getProviderPlugins(providerName string) []string {
return []string{"velero/velero-plugin-for-microsoft-azure:v1.2.0"}
case "vsphere":
return []string{"velero/velero-plugin-for-aws:v1.2.1", "vsphereveleroplugin/velero-plugin-for-vsphere:v1.1.1"}
case "gcp":
return []string{"velero/velero-plugin-for-gcp:v1.2.1"}
default:
return []string{""}
panic(fmt.Errorf("unknown provider name: %s", providerName))
}
}