From cb1edc00ef86c7e0c5550498bb1aa9372b462b14 Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Thu, 5 Jan 2023 21:25:02 +0100
Subject: [PATCH] Revert "e2e storage: define local PersistentVolume tests in
 deterministic order"

This reverts commit 5636418f10cbf77af917f7f3ee60fae0b1eddb33. Ginkgo is
now handling the random spec ordering.
---
 test/e2e/storage/persistent_volumes-local.go | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/test/e2e/storage/persistent_volumes-local.go b/test/e2e/storage/persistent_volumes-local.go
index 46676a79533..0a70005d5e0 100644
--- a/test/e2e/storage/persistent_volumes-local.go
+++ b/test/e2e/storage/persistent_volumes-local.go
@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"math/rand"
 	"path/filepath"
-	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -109,19 +108,6 @@ var setupLocalVolumeMap = map[localVolumeType]utils.LocalVolumeType{
 	BlockFsWithoutFormatLocalVolumeType:     utils.LocalVolumeBlock, // block device in Filesystem mode (default in this test suite)
 }
 
-// setupLocalVolumeMapKeys returns all keys in a sorted slice. This is needed
-// to define tests in a deterministic order.
-func setupLocalVolumeMapKeys() []localVolumeType {
-	var keys []localVolumeType
-	for key := range setupLocalVolumeMap {
-		keys = append(keys, key)
-	}
-	sort.Slice(keys, func(i, j int) bool {
-		return keys[i] < keys[j]
-	})
-	return keys
-}
-
 type localTestVolume struct {
 	// Local test resource
 	ltr *utils.LocalTestResource
@@ -195,7 +181,7 @@ var _ = utils.SIGDescribe("PersistentVolumes-local ", func() {
 		}
 	})
 
-	for _, tempTestVolType := range setupLocalVolumeMapKeys() {
+	for tempTestVolType := range setupLocalVolumeMap {
 
 		// New variable required for gingko test closures
 		testVolType := tempTestVolType