[E2E][EMS] Enable E2E tests on EMS snapshot builds (elastic#5227)

naemono · Jan 13, 2022 · d9c7715 · d9c7715
1 parent 98586dc
commit d9c7715
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 47 deletions.
diff --git a/test/e2e/test/maps/builder.go b/test/e2e/test/maps/builder.go
@@ -153,15 +153,7 @@ func (b Builder) SkipTest() bool {
 	if test.Ctx().TestLicense == "" {
 		return true
 	}
-
 	ver := version.MustParse(b.EMS.Spec.Version)
-
-	// remove or adjust as snapshot builds of EMS become available
-	// https://github.com/elastic/cloud-on-k8s/issues/4479
-	if test.IsSnapshotVersion(ver) {
-		return true
-	}
-
 	return version.SupportedMapsVersions.WithinRange(ver) != nil
 }
 

diff --git a/test/e2e/test/version.go b/test/e2e/test/version.go
@@ -45,7 +45,3 @@ func isValidUpgrade(from string, to string) (bool, error) {
 	validMajorDigit := dstVer.Major == srcVer.Major || dstVer.Major == srcVer.Major+1
 	return validMajorDigit && !srcVer.GTE(dstVer), nil
 }
-
-func IsSnapshotVersion(v version.Version) bool {
-	return len(v.Pre) > 0
-}
diff --git a/test/e2e/test/version_test.go b/test/e2e/test/version_test.go
@@ -8,8 +8,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-
-	"github.com/elastic/cloud-on-k8s/pkg/controller/common/version"
 )
 
 func TestIsValidUpgrade(t *testing.T) {
@@ -41,36 +39,3 @@ func TestIsValidUpgrade(t *testing.T) {
 		require.Equal(t, tt.isValid, isValid)
 	}
 }
-
-func Test_isSnapshot(t *testing.T) {
-	type args struct {
-		ver version.Version
-	}
-	tests := []struct {
-		name string
-		args args
-		want bool
-	}{
-		{
-			name: "stable",
-			args: args{
-				ver: version.MustParse("7.13.0"),
-			},
-			want: false,
-		},
-		{
-			name: "pre-release",
-			args: args{
-				ver: version.MustParse("7.13.0-SNAPSHOT"),
-			},
-			want: true,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := IsSnapshotVersion(tt.args.ver); got != tt.want {
-				t.Errorf("isSnapshot() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}