Fix TestFleetManagedUpgrade test + cleanup (#2809)

* add changelog

* fix changelog

* remove changelog

* Fix upgrade tests

* Making names consistent

* Running make notice

* Fix versions

* Update elastic-agent-libs dependency

---------

Co-authored-by: Alex Kristiansen <alex.kristiansen@elastic.co>

Author: ycombinator

NOTICE.txt

@@ -1367,11 +1367,11 @@ SOFTWARE
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/elastic-agent-libs
-Version: v0.3.9
+Version: v0.3.9-0.20230608184016-1f368a55a6ac
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.3.9/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.3.9-0.20230608184016-1f368a55a6ac/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/elastic/e2e-testing v1.99.2-0.20221205111528-ade3c840d0c0
 	github.com/elastic/elastic-agent-autodiscover v0.6.1
 	github.com/elastic/elastic-agent-client/v7 v7.1.2
-	github.com/elastic/elastic-agent-libs v0.3.9
+	github.com/elastic/elastic-agent-libs v0.3.9-0.20230608184016-1f368a55a6ac
 	github.com/elastic/elastic-agent-system-metrics v0.6.1
 	github.com/elastic/go-elasticsearch/v8 v8.8.0
 	github.com/elastic/go-licenser v0.4.1

go.sum

@@ -397,8 +397,8 @@ github.com/elastic/elastic-agent-autodiscover v0.6.1 h1:vXR+3QVDL7Ij7IMKul13iIiD
 github.com/elastic/elastic-agent-autodiscover v0.6.1/go.mod h1:yXYKFAG+Py+TcE4CCR8EAbJiYb+6Dz9sCDoWgOveqtU=
 github.com/elastic/elastic-agent-client/v7 v7.1.2 h1:p6KvvDMoFCBPvchxcx9cRXpRjsDaii0m/wE3lqQxpmM=
 github.com/elastic/elastic-agent-client/v7 v7.1.2/go.mod h1:G3Mk1pHXxvj3wC5FvsGUlPOsvapTB5SfrUmWiJDXT6Q=
-github.com/elastic/elastic-agent-libs v0.3.9 h1:2xbZUOM20Q9ni3dkNjj8r274fub22SuLqi6SedknV7g=
-github.com/elastic/elastic-agent-libs v0.3.9/go.mod h1:Fy5QqIOax0EOVeQJ2l5Ux+GmJsX549Obllru5R1bHLI=
+github.com/elastic/elastic-agent-libs v0.3.9-0.20230608184016-1f368a55a6ac h1:0tNQuC+Tz+j9/O6Oq5LH+ccvpmEQOFAaSyxaNREAdXM=
+github.com/elastic/elastic-agent-libs v0.3.9-0.20230608184016-1f368a55a6ac/go.mod h1:Fy5QqIOax0EOVeQJ2l5Ux+GmJsX549Obllru5R1bHLI=
 github.com/elastic/elastic-agent-system-metrics v0.6.1 h1:LCN1lvQTkdUuU/rKlpKyVMDU/G/I8/iZWCaW6K+mo4o=
 github.com/elastic/elastic-agent-system-metrics v0.6.1/go.mod h1:Bj8XM/uNKm553blQHkGNEICRLGnVEtw8yttmV5vBngA=
 github.com/elastic/elastic-package v0.36.0/go.mod h1:TUyhRXtf+kazrUthMF+5FtngcFJZtsgty0o/nnl8UFU=

pkg/version/version_parser.go

@@ -107,6 +107,27 @@ func (psv ParsedSemVer) Less(other ParsedSemVer) bool {
 	return false
 }
 
+func (psv ParsedSemVer) GetPreviousMinor() (*ParsedSemVer, error) {
+	major := psv.Major()
+	minor := psv.Minor()
+
+	if minor > 0 {
+		// We have at least one previous minor version in the current
+		// major version series
+		return NewParsedSemVer(major, minor-1, 0, "", ""), nil
+	}
+
+	// We are at the first minor of the current major version series. To
+	// figure out the previous minor, we need to rely on knowledge of
+	// the release versions from the past major series'.
+	switch major {
+	case 8:
+		return NewParsedSemVer(7, 17, 10, "", ""), nil
+	}
+
+	return nil, fmt.Errorf("unable to determine previous minor version for [%s]", psv.String())
+}
+
 func (psv ParsedSemVer) String() string {
 	b := new(strings.Builder)
 	b.WriteString(psv.CoreVersion())