From 000aea63ca7d7aa4e919d1851a399e750af7d888 Mon Sep 17 00:00:00 2001
From: Matthew Wong <mawong@redhat.com>
Date: Mon, 9 Jul 2018 15:08:13 -0400
Subject: [PATCH] Fix wrong flexvolume dir on gce ubuntu

---
 test/e2e/storage/flexvolume.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/e2e/storage/flexvolume.go b/test/e2e/storage/flexvolume.go
index 6b6d767ea1c..8544cd00b4e 100644
--- a/test/e2e/storage/flexvolume.go
+++ b/test/e2e/storage/flexvolume.go
@@ -129,7 +129,7 @@ func uninstallFlex(c clientset.Interface, node *v1.Node, vendor, driver string)
 func getFlexDir(c clientset.Interface, node *v1.Node, vendor, driver string) string {
 	volumePluginDir := defaultVolumePluginDir
 	if framework.ProviderIs("gce") {
-		if node == nil && framework.MasterOSDistroIs("gci") {
+		if node == nil && framework.MasterOSDistroIs("gci", "ubuntu") {
 			v, err := getMasterVersion(c)
 			if err != nil {
 				framework.Failf("Error getting master version: %v", err)
@@ -140,7 +140,7 @@ func getFlexDir(c clientset.Interface, node *v1.Node, vendor, driver string) str
 			} else {
 				volumePluginDir = gciVolumePluginDirLegacy
 			}
-		} else if node != nil && framework.NodeOSDistroIs("gci") {
+		} else if node != nil && framework.NodeOSDistroIs("gci", "ubuntu") {
 			if getNodeVersion(node).AtLeast(versionutil.MustParseGeneric(gciVolumePluginDirVersion)) {
 				volumePluginDir = gciVolumePluginDir
 			} else {