Adjust to 8.14.0-SNAPSHOT as minimum.

Author: blakerouse

testing/integration/upgrade_fleet_test.go

@@ -215,18 +215,18 @@ func testUpgradeFleetManagedElasticAgent(
 	require.NoError(t, err)
 
 	if unprivileged {
-		if startParsedVersion.Less(*upgradetest.Version_8_13_0) {
-			t.Skipf("Starting version %s is less than 8.13 and doesn't support --unprivileged", startParsedVersion.String())
+		if startParsedVersion.Less(*upgradetest.Version_8_13_0_SNAPSHOT) {
+			t.Skipf("Starting version %s is less than 8.13-SNAPSHOT and doesn't support --unprivileged", startParsedVersion.String())
 		}
-		if endParsedVersion.Less(*upgradetest.Version_8_13_0) {
-			t.Skipf("Ending version %s is less than 8.13 and doesn't support --unprivileged", endParsedVersion.String())
+		if endParsedVersion.Less(*upgradetest.Version_8_13_0_SNAPSHOT) {
+			t.Skipf("Ending version %s is less than 8.13-SNAPSHOT and doesn't support --unprivileged", endParsedVersion.String())
 		}
 		if runtime.GOOS != define.Linux {
-			if startParsedVersion.Less(*upgradetest.Version_8_14_0) {
-				t.Skipf("Starting version %s is less than 8.14 and doesn't support --unprivileged on Windows", startParsedVersion.String())
+			if startParsedVersion.Less(*upgradetest.Version_8_14_0_SNAPSHOT) {
+				t.Skipf("Starting version %s is less than 8.14-SNAPSHOT and doesn't support --unprivileged on Windows", startParsedVersion.String())
 			}
-			if endParsedVersion.Less(*upgradetest.Version_8_14_0) {
-				t.Skipf("Ending version %s is less than 8.14 and doesn't support --unprivileged on Windows", endParsedVersion.String())
+			if endParsedVersion.Less(*upgradetest.Version_8_14_0_SNAPSHOT) {
+				t.Skipf("Ending version %s is less than 8.14-SNAPSHOT and doesn't support --unprivileged on Windows", endParsedVersion.String())
 			}
 		}
 	}

testing/integration/upgrade_standalone_same_commit_test.go

@@ -54,10 +54,10 @@ func TestStandaloneUpgradeSameCommit(t *testing.T) {
 
 	unprivilegedAvailable := false
 	// This is probably redundant: see the skip statement above
-	if runtime.GOOS == define.Linux && !currentVersion.Less(*upgradetest.Version_8_13_0) {
+	if runtime.GOOS == define.Linux && !currentVersion.Less(*upgradetest.Version_8_13_0_SNAPSHOT) {
 		// only available if version is 8.13+ on Linux
 		unprivilegedAvailable = true
-	} else if !currentVersion.Less(*upgradetest.Version_8_14_0) {
+	} else if !currentVersion.Less(*upgradetest.Version_8_14_0_SNAPSHOT) {
 		// 8.14+ its always available
 		unprivilegedAvailable = true
 	}

testing/integration/upgrade_standalone_test.go

@@ -37,10 +37,10 @@ func TestStandaloneUpgrade(t *testing.T) {
 
 	for _, startVersion := range versionList {
 		unprivilegedAvailable := false
-		if runtime.GOOS == define.Linux && !startVersion.Less(*upgradetest.Version_8_13_0) && !endVersion.Less(*upgradetest.Version_8_13_0) {
+		if runtime.GOOS == define.Linux && !startVersion.Less(*upgradetest.Version_8_13_0_SNAPSHOT) && !endVersion.Less(*upgradetest.Version_8_13_0_SNAPSHOT) {
 			// unprivileged available if both versions are 8.13+ on Linux
 			unprivilegedAvailable = true
-		} else if !startVersion.Less(*upgradetest.Version_8_14_0) && !endVersion.Less(*upgradetest.Version_8_14_0) {
+		} else if !startVersion.Less(*upgradetest.Version_8_14_0_SNAPSHOT) && !endVersion.Less(*upgradetest.Version_8_14_0_SNAPSHOT) {
 			// always available if both versions are 8.14+
 			unprivilegedAvailable = true
 		}

testing/upgradetest/upgrader.go

@@ -209,12 +209,12 @@ func PerformUpgrade(
 	// in the unprivileged is unset we adjust it to use unprivileged when the version allows it
 	// in the case that its explicitly set then we ensure the version supports it
 	if upgradeOpts.unprivileged == nil {
-		if !startVersion.Less(*Version_8_13_0) && !endVersion.Less(*Version_8_13_0) && runtime.GOOS == define.Linux {
+		if !startVersion.Less(*Version_8_13_0_SNAPSHOT) && !endVersion.Less(*Version_8_13_0_SNAPSHOT) && runtime.GOOS == define.Linux {
 			// both version support --unprivileged on Linux
 			unprivileged := true
 			upgradeOpts.unprivileged = &unprivileged
 			logger.Logf("installation of Elastic Agent will use --unprivileged as both start and end version support --unprivileged mode on Linux")
-		} else if !startVersion.Less(*Version_8_14_0) && !endVersion.Less(*Version_8_14_0) {
+		} else if !startVersion.Less(*Version_8_14_0_SNAPSHOT) && !endVersion.Less(*Version_8_14_0_SNAPSHOT) {
 			// both version support --unprivileged on all platforms
 			unprivileged := true
 			upgradeOpts.unprivileged = &unprivileged
@@ -225,10 +225,10 @@ func PerformUpgrade(
 			upgradeOpts.unprivileged = &unprivileged
 		}
 	} else if *upgradeOpts.unprivileged {
-		if startVersion.Less(*Version_8_13_0) {
+		if startVersion.Less(*Version_8_13_0_SNAPSHOT) {
 			return errors.New("cannot install starting version with --unprivileged (which is default) because the it is older than 8.13")
 		}
-		if endVersion.Less(*Version_8_13_0) {
+		if endVersion.Less(*Version_8_13_0_SNAPSHOT) {
 			return errors.New("cannot upgrade to ending version as end version doesn't support running with --unprivileged (which is default) because it is older than 8.13")
 		}
 	}

testing/upgradetest/versions.go

@@ -35,10 +35,8 @@ var (
 	Version_8_11_0_SNAPSHOT = version.NewParsedSemVer(8, 11, 0, "SNAPSHOT", "")
 	// Version_8_13_0_SNAPSHOT is the minimum version for testing upgrading agent with the same hash
 	Version_8_13_0_SNAPSHOT = version.NewParsedSemVer(8, 13, 0, "SNAPSHOT", "")
-	// Version_8_13_0 is the minimum version for proper unprivileged execution on Linux
-	Version_8_13_0 = version.NewParsedSemVer(8, 13, 0, "", "")
-	// Version_8_14_0 is the minimum version for proper unprivileged execution on all platforms
-	Version_8_14_0 = version.NewParsedSemVer(8, 14, 0, "", "")
+	// Version_8_14_0_SNAPSHOT is the minimum version for proper unprivileged execution on all platforms
+	Version_8_14_0_SNAPSHOT = version.NewParsedSemVer(8, 14, 0, "SNAPSHOT", "")
 
 	// ErrNoSnapshot is returned when a requested snapshot is not on the version list.
 	ErrNoSnapshot = errors.New("failed to find a snapshot on the version list")