mirror of
https://gitea.com/gitea/act_runner.git
synced 2026-11-01 12:55:54 +08:00
bf03f36d5a
The Docker entrypoint always checked `.runner` in `/data` and ignored `runner.file` from `CONFIG_FILE`. When `runner.file` pointed elsewhere, it re-registered on every start, or skipped registration because of a stale `.runner`. It now reads the path from a new `config runner-file` subcommand, which resolves `runner.file` the same way as `register` and `daemon`. Closes https://gitea.com/gitea/runner/issues/585 --------- Co-authored-by: silverwind <me@silverwind.io> Reviewed-on: https://gitea.com/gitea/runner/pulls/1259 Reviewed-by: silverwind <2021+silverwind@noreply.gitea.com>
111 lines
3.4 KiB
Go
111 lines
3.4 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package cmd
|
|
|
|
import (
|
|
"bytes"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"gitea.com/gitea/runner/internal/pkg/config"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func runConfigCmd(t *testing.T, configFile string, args ...string) (string, string, error) {
|
|
t.Helper()
|
|
out, errOut := &bytes.Buffer{}, &bytes.Buffer{}
|
|
cmd := loadConfigCmd(&configFile)
|
|
cmd.SetOut(out)
|
|
cmd.SetErr(errOut)
|
|
cmd.SetArgs(args)
|
|
err := cmd.Execute()
|
|
return out.String(), errOut.String(), err
|
|
}
|
|
|
|
func TestConfigCmdGeneratePrintsTheExample(t *testing.T) {
|
|
out, _, err := runConfigCmd(t, "", "generate")
|
|
require.NoError(t, err)
|
|
assert.Equal(t, string(config.Example), out)
|
|
}
|
|
|
|
func TestConfigCmdInitWritesTheMinimalConfig(t *testing.T) {
|
|
dir := t.TempDir()
|
|
file := filepath.Join(dir, "config.yaml")
|
|
|
|
out, _, err := runConfigCmd(t, file, "init")
|
|
require.NoError(t, err)
|
|
assert.Contains(t, out, file)
|
|
content, err := os.ReadFile(file)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, config.Minimal, string(content))
|
|
|
|
_, _, err = runConfigCmd(t, file, "init")
|
|
require.Error(t, err)
|
|
assert.Contains(t, err.Error(), "--force")
|
|
|
|
_, _, err = runConfigCmd(t, file, "init", "--force")
|
|
require.NoError(t, err)
|
|
|
|
t.Chdir(t.TempDir())
|
|
_, _, err = runConfigCmd(t, "", "init")
|
|
require.NoError(t, err)
|
|
assert.FileExists(t, defaultConfigFileNames[0])
|
|
}
|
|
|
|
// The subcommands only wire arguments through, so one pass over all of them is enough.
|
|
func TestConfigCmdEditsTheFile(t *testing.T) {
|
|
file := filepath.Join(t.TempDir(), "config.yaml")
|
|
require.NoError(t, os.WriteFile(file, []byte("runner:\n labels:\n - self-hosted\n"), 0o600))
|
|
|
|
_, _, err := runConfigCmd(t, file, "set", "container.options", "--cpus 2")
|
|
require.NoError(t, err)
|
|
_, _, err = runConfigCmd(t, file, "add", "runner.labels", "ubuntu:docker://node:22")
|
|
require.NoError(t, err)
|
|
_, _, err = runConfigCmd(t, file, "remove", "runner.labels", "self-hosted")
|
|
require.NoError(t, err)
|
|
|
|
out, _, err := runConfigCmd(t, file, "get", "runner.labels")
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "ubuntu:docker://node:22\n", out)
|
|
|
|
out, _, err = runConfigCmd(t, file, "get", "container.options")
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "--cpus 2\n", out)
|
|
}
|
|
|
|
func TestConfigCmdResolvesTheConfigFile(t *testing.T) {
|
|
t.Run("falls back to the working directory", func(t *testing.T) {
|
|
dir := t.TempDir()
|
|
require.NoError(t, os.WriteFile(filepath.Join(dir, "config.yaml"), []byte("runner:\n capacity: 2\n"), 0o600))
|
|
t.Chdir(dir)
|
|
|
|
out, errOut, err := runConfigCmd(t, "", "get", "runner.capacity")
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "2\n", out)
|
|
assert.Contains(t, errOut, "using config file")
|
|
})
|
|
|
|
t.Run("reports that none was found", func(t *testing.T) {
|
|
t.Chdir(t.TempDir())
|
|
|
|
_, _, err := runConfigCmd(t, "", "set", "runner.capacity", "4")
|
|
require.Error(t, err)
|
|
assert.Contains(t, err.Error(), "--config")
|
|
})
|
|
}
|
|
|
|
func TestConfigCmdRunnerFileUsesConfiguredPathOrDefault(t *testing.T) {
|
|
out, _, err := runConfigCmd(t, "", "runner-file")
|
|
require.NoError(t, err)
|
|
assert.Equal(t, ".runner\n", out)
|
|
file := filepath.Join(t.TempDir(), "config.yaml")
|
|
require.NoError(t, os.WriteFile(file, []byte("runner:\n file: 'state dir/registration.json'\n"), 0o600))
|
|
out, _, err = runConfigCmd(t, file, "runner-file")
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "state dir/registration.json\n", out)
|
|
}
|