feat: build job limit (#122)

Author: raphaelcoeffic

cli/cli.go

@@ -132,7 +132,7 @@ func Build(
 	defer os.RemoveAll(sourceDir)
 	recorder := buildlogs.NewRecorder()
 	gitDownloader := source.NewGitDownloader(sourceDir, recorder)
-	firmwareBuilder := firmware.NewPodmanBuilder(sourceDir, recorder, runtime.NumCPU()/2, 1024*1024*1024*2)
+	firmwareBuilder := firmware.NewPodmanBuilder(sourceDir, recorder, runtime.NumCPU(), 1024*1024*1024*2)
 
 	err = gitDownloader.Download(ctx, sourceRepository, commitHash)
 	if err != nil {

firmware/podman_builder.go

@@ -28,7 +28,6 @@ type PodmanBuilder struct {
 	workingDir     string
 	PodmanExecutor PodmanExecutor
 	CPULimit       int // logical cores
-	MemoryLimit    int // bytes
 	recorder       *buildlogs.Recorder
 }
 
@@ -37,7 +36,6 @@ func NewPodmanBuilder(workingDir string, recorder *buildlogs.Recorder, cpuLimit
 		workingDir:     workingDir,
 		PodmanExecutor: DefaultPodmanExecutor(workingDir),
 		CPULimit:       cpuLimit,
-		MemoryLimit:    memoryLimit,
 		recorder:       recorder,
 	}
 }
@@ -71,6 +69,7 @@ func (builder *PodmanBuilder) buildCmdArgs(
 	env := []string{
 		fmt.Sprintf("FLAVOR=%s", target),
 		fmt.Sprintf("EXTRA_OPTIONS=%s", CmakeFlags(flags)),
+		fmt.Sprintf("MAX_JOBS=%d", builder.CPULimit),
 	}
 	if versionTag == "nightly" {
 		env = append(env, "EDGETX_VERSION_SUFFIX=nightly")

firmware/podman_builder_test.go

@@ -3,6 +3,7 @@ package firmware_test
 import (
 	"context"
 	"os"
+	"runtime"
 	"testing"
 	"time"
 
@@ -28,7 +29,7 @@ func TestFirmwareFirmwareBuild(t *testing.T) {
 	assert.Nil(t, err, "failed to download firmware")
 	t.Log("will start firmware build")
 
-	firmwareBuilder := firmware.NewPodmanBuilder(sourceDir, recorder, 2, 1024*1024*1024)
+	firmwareBuilder := firmware.NewPodmanBuilder(sourceDir, recorder, runtime.NumCPU(), 1024*1024*1024)
 	flags := []firmware.BuildFlag{
 		firmware.NewFlag("DISABLE_COMPANION", "YES"),
 		firmware.NewFlag("CMAKE_BUILD_TYPE", "Release"),

processor/worker.go

@@ -3,6 +3,7 @@ package processor
 import (
 	"context"
 	"os"
+	"runtime"
 	"time"
 
 	"github.com/edgetx/cloudbuild/artifactory"
@@ -39,7 +40,7 @@ func (worker *Worker) build(
 
 	recorder := buildlogs.NewRecorder()
 	gitDownloader := source.NewGitDownloader(sourceDir, recorder)
-	firmwareBuilder := firmware.NewPodmanBuilder(sourceDir, recorder, 4, 2*1024*1024*1024)
+	firmwareBuilder := firmware.NewPodmanBuilder(sourceDir, recorder, runtime.NumCPU(), 2*1024*1024*1024)
 
 	return worker.artifactory.Build(
 		ctx, job, recorder, gitDownloader, firmwareBuilder,
@@ -73,7 +74,7 @@ func (worker *Worker) PullImage(ctx context.Context, buildImage string) error {
 		We do this so actual build process is faster because of the cached build image
 	*/
 	recorder := buildlogs.NewRecorder()
-	firmwareBuilder := firmware.NewPodmanBuilder("/tmp", recorder, 4, 1024*1024*1024)
+	firmwareBuilder := firmware.NewPodmanBuilder("/tmp", recorder, runtime.NumCPU(), 1024*1024*1024)
 	ctx, cancel := context.WithTimeout(ctx, artifactory.MaxBuildDuration)
 	defer cancel()