Build Heartbeat for Agent from the OSS directory

jsoriano · Aug 11, 2020 · 7dc49ec · 7dc49ec
1 parent d036955
commit 7dc49ec
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/x-pack/elastic-agent/magefile.go b/x-pack/elastic-agent/magefile.go
@@ -523,15 +523,24 @@ func packageAgent(requiredPackages []string, packagingFn func()) {
 		defer os.RemoveAll(dropPath)
 		defer os.Unsetenv(agentDropPath)
 
-		packedBeats := []string{"filebeat", "heartbeat", "metricbeat"}
+		packedBeats := []struct {
+			name    string
+			relPath string
+		}{
+			{"filebeat", ".."},
+			{"metricbeat", ".."},
+
+			// Built from the OSS directory
+			{"heartbeat", "../.."},
+		}
 
 		for _, b := range packedBeats {
-			pwd, err := filepath.Abs(filepath.Join("..", b))
+			pwd, err := filepath.Abs(filepath.Join(b.relPath, b.name))
 			if err != nil {
 				panic(err)
 			}
 
-			if requiredPackagesPresent(pwd, b, version, requiredPackages) {
+			if requiredPackagesPresent(pwd, b.name, version, requiredPackages) {
 				continue
 			}