Merge pull request #3 from gitbugactions/maxparallel

gitbugactions · Nov 3, 2023 · 5c84034 · 5c84034
2 parents de53f69 + 5db572f
commit 5c84034
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/cmd/input.go b/cmd/input.go
@@ -36,6 +36,7 @@ type Input struct {
 	containerDaemonSocket              string
 	containerOptions                   string
 	volumeOptions                      string
+	maxParallel                        int
 	noWorkflowRecurse                  bool
 	useGitIgnore                       bool
 	githubInstance                     string

diff --git a/cmd/root.go b/cmd/root.go
@@ -86,6 +86,7 @@ func Execute(ctx context.Context, version string) {
 	rootCmd.PersistentFlags().StringVarP(&input.containerDaemonSocket, "container-daemon-socket", "", "", "URI to Docker Engine socket (e.g.: unix://~/.docker/run/docker.sock or - to disable bind mounting the socket)")
 	rootCmd.PersistentFlags().StringVarP(&input.containerOptions, "container-options", "", "", "Custom docker container options for the job container without an options property in the job definition")
 	rootCmd.PersistentFlags().StringVarP(&input.volumeOptions, "volume-options", "", "", "Custom docker volume options for the job volume")
+	rootCmd.PersistentFlags().IntVarP(&input.maxParallel, "max-parallel", "", runtime.NumCPU(), "Maximum number of jobs to run in parallel")
 	rootCmd.PersistentFlags().StringVarP(&input.githubInstance, "github-instance", "", "github.com", "GitHub instance to use. Don't use this if you are not using GitHub Enterprise Server.")
 	rootCmd.PersistentFlags().StringVarP(&input.artifactServerPath, "artifact-server-path", "", "", "Defines the path where the artifact server stores uploads and retrieves downloads from. If not specified the artifact server will not start.")
 	rootCmd.PersistentFlags().StringVarP(&input.artifactServerAddr, "artifact-server-addr", "", common.GetOutboundIP().String(), "Defines the address to which the artifact server binds.")
@@ -599,6 +600,7 @@ func newRunCommand(ctx context.Context, input *Input) func(*cobra.Command, []str
 			ContainerDaemonSocket:              input.containerDaemonSocket,
 			ContainerOptions:                   input.containerOptions,
 			VolumeOptions:                      input.volumeOptions,
+			MaxParallel:                        input.maxParallel,
 			UseGitIgnore:                       input.useGitIgnore,
 			GitHubInstance:                     input.githubInstance,
 			ContainerCapAdd:                    input.containerCapAdd,

diff --git a/pkg/runner/runner.go b/pkg/runner/runner.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"runtime"
 
 	log "github.com/sirupsen/logrus"
 
@@ -45,6 +44,7 @@ type Config struct {
 	ContainerDaemonSocket              string                     // Path to Docker daemon socket
 	ContainerOptions                   string                     // Options for the job container
 	VolumeOptions                      string                     // Options for the job volume
+	MaxParallel                        int                        // maximum number of jobs to run in parallel
 	UseGitIgnore                       bool                       // controls if paths in .gitignore should not be copied into container, default true
 	GitHubInstance                     string                     // GitHub instance to use, default "github.com"
 	ContainerCapAdd                    []string                   // list of kernel capabilities to add to the containers
@@ -187,7 +187,7 @@ func (runner *runnerImpl) NewPlanExecutor(plan *model.Plan) common.Executor {
 				}
 				pipeline = append(pipeline, common.NewParallelExecutor(maxParallel, stageExecutor...))
 			}
-			ncpu := runtime.NumCPU()
+			ncpu := runner.config.MaxParallel
 			if 1 > ncpu {
 				ncpu = 1
 			}