darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

split build construction out of worker

Browse source 
(todo: inject runner into worker)

Signed-off-by: Abhijit Hiremagalur <abhi@pivotallabs.com>
This commit is contained in:
Alex Suraci 2014-02-24 17:32:40 -08:00 committed by Abhijit Hiremagalur
parent acc51e83fd
commit ddc8e7a56f
1 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
pkg/queue/worker.go
View file

@ -7,6 +7,7 @@ import (
"github.com/drone/drone/pkg/build/docker"
"github.com/drone/drone/pkg/build/git"
r "github.com/drone/drone/pkg/build/repo"
"github.com/drone/drone/pkg/build/script"
"github.com/drone/drone/pkg/channel"
"github.com/drone/drone/pkg/database"
. "github.com/drone/drone/pkg/model"
@ -167,17 +168,49 @@ func (w *worker) execute(task *BuildTask) error {
return nil
}
type runner struct {
dockerClient *docker.Client
timeout time.Duration
}
func (r *runner) Build(buildScript *script.Build, repo *r.Repo, key []byte, buildOutput io.Writer) (bool, error) {
builder := build.New(r.dockerClient)
builder.Build = buildScript
builder.Repo = repo
builder.Key = key
builder.Stdout = buildOutput
builder.Timeout = r.timeout
err := builder.Run()
return builder.BuildState == nil || builder.BuildState.ExitCode != 0, err
}
func newRunner(dockerClient *docker.Client, timeout time.Duration) *runner {
return &runner{
dockerClient: dockerClient,
timeout: timeout,
}
}
func runBuild(b *BuildTask, buf io.Writer) (bool, error) {
builder := build.New(docker.DefaultClient)
builder.Build = b.Script
builder.Repo = &r.Repo{Path: b.Repo.URL, Branch: b.Commit.Branch, Commit: b.Commit.Hash, PR: b.Commit.PullRequest, Dir: filepath.Join("/var/cache/drone/src", b.Repo.Slug), Depth: git.GitDepth(b.Script.Git)}
builder.Key = []byte(b.Repo.PrivateKey)
builder.Stdout = buf
builder.Timeout = 300 * time.Minute
runner := newRunner(docker.DefaultClient, 300*time.Minute)
buildErr := builder.Run()
repo := &r.Repo{
Path: b.Repo.URL,
Branch: b.Commit.Branch,
Commit: b.Commit.Hash,
PR: b.Commit.PullRequest,
Dir: filepath.Join("/var/cache/drone/src", b.Repo.Slug),
Depth: git.GitDepth(b.Script.Git),
}
return builder.BuildState == nil || builder.BuildState.ExitCode != 0, buildErr
return runner.Build(
b.Script,
repo,
[]byte(b.Repo.PrivateKey),
buf,
)
}
// updateGitHubStatus is a helper function that will send