Skip to content

[runner] Ensure working_dir exists #3052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 3, 2025
Merged

[runner] Ensure working_dir exists #3052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b3074a
[runner] Ensure `working_dir` exists
un-def Sep 2, 2025
bea0258
Merge remote-tracking branch 'origin/master' into issue_3051_runner_f…
un-def Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions runner/internal/executor/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,12 @@ func (ex *RunExecutor) Run(ctx context.Context) (err error) {

ex.setJobCredentials(ctx)

if err := ex.setJobWorkingDir(ctx); err != nil {
if err := ex.prepareJobWorkingDir(ctx); err != nil {
ex.SetJobStateWithTerminationReason(
ctx,
types.JobStateFailed,
types.TerminationReasonExecutorError,
fmt.Sprintf("Failed to set the working dir (%s)", err),
fmt.Sprintf("Failed to set up the working dir (%s)", err),
)
return gerrors.Wrap(err)
}
Expand Down Expand Up @@ -352,7 +352,7 @@ func (ex *RunExecutor) setJobCredentials(ctx context.Context) {
log.Trace(ctx, "Job credentials", "uid", ex.jobUid, "gid", ex.jobGid, "home", ex.jobHomeDir)
}

func (ex *RunExecutor) setJobWorkingDir(ctx context.Context) error {
func (ex *RunExecutor) prepareJobWorkingDir(ctx context.Context) error {
var err error
if ex.jobSpec.WorkingDir == nil {
ex.jobWorkingDir, err = os.Getwd()
Expand All @@ -369,6 +369,9 @@ func (ex *RunExecutor) setJobWorkingDir(ctx context.Context) error {
}
}
log.Trace(ctx, "Job working dir", "path", ex.jobWorkingDir)
if err := common.MkdirAll(ctx, ex.jobWorkingDir, ex.jobUid, ex.jobGid); err != nil {
return gerrors.Wrap(err)
}
return nil
}

Expand Down
6 changes: 3 additions & 3 deletions runner/internal/executor/executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func TestExecutor_WorkingDir_Set(t *testing.T) {

ex.jobSpec.WorkingDir = &workingDir
ex.jobSpec.Commands = append(ex.jobSpec.Commands, "pwd")
err = ex.setJobWorkingDir(context.TODO())
err = ex.prepareJobWorkingDir(context.TODO())
require.NoError(t, err)
require.Equal(t, workingDir, ex.jobWorkingDir)
err = os.MkdirAll(workingDir, 0o755)
Expand All @@ -47,7 +47,7 @@ func TestExecutor_WorkingDir_NotSet(t *testing.T) {
require.NoError(t, err)
ex.jobSpec.WorkingDir = nil
ex.jobSpec.Commands = append(ex.jobSpec.Commands, "pwd")
err = ex.setJobWorkingDir(context.TODO())
err = ex.prepareJobWorkingDir(context.TODO())
require.NoError(t, err)
require.Equal(t, cwd, ex.jobWorkingDir)

Expand Down Expand Up @@ -158,7 +158,7 @@ func TestExecutor_RemoteRepo(t *testing.T) {
err := os.WriteFile(ex.codePath, []byte{}, 0o600) // empty diff
require.NoError(t, err)

err = ex.setJobWorkingDir(context.TODO())
err = ex.prepareJobWorkingDir(context.TODO())
require.NoError(t, err)
err = ex.setupRepo(context.TODO())
require.NoError(t, err)
Expand Down
Loading