mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-05-13 22:40:24 +00:00
Forgejo Runner can optionally ask for a particular job. Example: `forgejo-runner one-job --handle 9d52c7d8-aebe-426b-b015-dd453aacaada`. This change adds the necessary job filtering to Forgejo. See https://code.forgejo.org/forgejo/forgejo-actions-feature-requests/issues/76 for the motivation and design considerations. PR for the extension of the runner protocol: https://code.forgejo.org/forgejo/actions-proto/pulls/18 Related change in Forgejo Runner with usage example: https://code.forgejo.org/forgejo/runner/pulls/1443 ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests for Go changes (can be removed for JavaScript changes) - I added test coverage for Go changes... - [x] in their respective `*_test.go` for unit tests. - [x] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I ran... - [x] `make pr-go` before pushing ### Tests for JavaScript changes (can be removed for Go changes) - I added test coverage for JavaScript changes... - [ ] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [x] This change will be noticed by a Forgejo user or admin (feature, bug fix, performance, etc.). I suggest to include a release note for this change. - [ ] This change is not visible to a Forgejo user or admin (refactor, dependency upgrade, etc.). I think there is no need to add a release note for this change. *The decision if the pull request will be shown in the release notes is up to the mergers / release team.* The content of the `release-notes/<pull request number>.md` file will serve as the basis for the release notes. If the file does not exist, the title of the pull request will be used instead. <!--start release-notes-assistant--> ## Release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - Features - [PR](https://codeberg.org/forgejo/forgejo/pulls/11676): <!--number 11676 --><!--line 0 --><!--description YWxsb3cgcnVubmVycyB0byByZXF1ZXN0IGEgcGFydGljdWxhciBqb2I=-->allow runners to request a particular job<!--description--> <!--end release-notes-assistant--> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/11676 Reviewed-by: Mathieu Fenniak <mfenniak@noreply.codeberg.org> Co-authored-by: Andreas Ahlenstorf <andreas@ahlenstorf.ch> Co-committed-by: Andreas Ahlenstorf <andreas@ahlenstorf.ch>
276 lines
9.2 KiB
Go
276 lines
9.2 KiB
Go
// Copyright 2024 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package integration
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/http"
|
|
"testing"
|
|
"time"
|
|
|
|
auth_model "forgejo.org/models/auth"
|
|
"forgejo.org/modules/setting"
|
|
|
|
pingv1 "code.forgejo.org/forgejo/actions-proto/ping/v1"
|
|
"code.forgejo.org/forgejo/actions-proto/ping/v1/pingv1connect"
|
|
runnerv1 "code.forgejo.org/forgejo/actions-proto/runner/v1"
|
|
"code.forgejo.org/forgejo/actions-proto/runner/v1/runnerv1connect"
|
|
"connectrpc.com/connect"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"google.golang.org/protobuf/types/known/timestamppb"
|
|
)
|
|
|
|
type mockRunner struct {
|
|
client *mockRunnerClient
|
|
uuid, token string
|
|
lastTasksVersion int64
|
|
}
|
|
|
|
type mockRunnerClient struct {
|
|
pingServiceClient pingv1connect.PingServiceClient
|
|
runnerServiceClient runnerv1connect.RunnerServiceClient
|
|
}
|
|
|
|
func newMockRunner() *mockRunner {
|
|
client := newMockRunnerClient("", "")
|
|
return &mockRunner{client: client}
|
|
}
|
|
|
|
func newMockRunnerClientWithRequestKey(uuid, token, requestKey string) *mockRunnerClient {
|
|
baseURL := fmt.Sprintf("%sapi/actions", setting.AppURL)
|
|
|
|
opt := connect.WithInterceptors(connect.UnaryInterceptorFunc(func(next connect.UnaryFunc) connect.UnaryFunc {
|
|
return func(ctx context.Context, req connect.AnyRequest) (connect.AnyResponse, error) {
|
|
if uuid != "" {
|
|
req.Header().Set("x-runner-uuid", uuid)
|
|
}
|
|
if token != "" {
|
|
req.Header().Set("x-runner-token", token)
|
|
}
|
|
if requestKey != "" {
|
|
req.Header().Set("x-runner-request-key", requestKey)
|
|
}
|
|
return next(ctx, req)
|
|
}
|
|
}))
|
|
|
|
client := &mockRunnerClient{
|
|
pingServiceClient: pingv1connect.NewPingServiceClient(http.DefaultClient, baseURL, opt),
|
|
runnerServiceClient: runnerv1connect.NewRunnerServiceClient(http.DefaultClient, baseURL, opt),
|
|
}
|
|
|
|
return client
|
|
}
|
|
|
|
func newMockRunnerClient(uuid, token string) *mockRunnerClient {
|
|
return newMockRunnerClientWithRequestKey(uuid, token, "")
|
|
}
|
|
|
|
func (r *mockRunner) doPing(t *testing.T) {
|
|
resp, err := r.client.pingServiceClient.Ping(t.Context(), connect.NewRequest(&pingv1.PingRequest{
|
|
Data: "mock-runner",
|
|
}))
|
|
require.NoError(t, err)
|
|
require.Equal(t, "Hello, mock-runner!", resp.Msg.Data)
|
|
}
|
|
|
|
func (r *mockRunner) doRegister(t *testing.T, name, token string, labels []string) {
|
|
r.doPing(t)
|
|
resp, err := r.client.runnerServiceClient.Register(t.Context(), connect.NewRequest(&runnerv1.RegisterRequest{
|
|
Name: name,
|
|
Token: token,
|
|
Version: "mock-runner-version",
|
|
Labels: labels,
|
|
Ephemeral: false,
|
|
}))
|
|
require.NoError(t, err)
|
|
r.uuid = resp.Msg.Runner.Uuid
|
|
r.token = resp.Msg.Runner.Token
|
|
r.client = newMockRunnerClient(r.uuid, r.token)
|
|
}
|
|
|
|
func (r *mockRunner) doRegisterEphemeral(t *testing.T, name, token string, labels []string) {
|
|
r.doPing(t)
|
|
resp, err := r.client.runnerServiceClient.Register(t.Context(), connect.NewRequest(&runnerv1.RegisterRequest{
|
|
Name: name,
|
|
Token: token,
|
|
Version: "mock-runner-version",
|
|
Labels: labels,
|
|
Ephemeral: true,
|
|
}))
|
|
require.NoError(t, err)
|
|
r.uuid = resp.Msg.Runner.Uuid
|
|
r.token = resp.Msg.Runner.Token
|
|
r.client = newMockRunnerClient(r.uuid, r.token)
|
|
}
|
|
|
|
func (r *mockRunner) setRequestKey(requestKey string) {
|
|
r.client = newMockRunnerClientWithRequestKey(r.uuid, r.token, requestKey)
|
|
}
|
|
|
|
func (r *mockRunner) registerAsRepoRunner(t *testing.T, ownerName, repoName, runnerName string, labels []string) {
|
|
if !setting.Database.Type.IsSQLite3() {
|
|
assert.FailNow(t, "registering a mock runner when using a database other than SQLite leaves leftovers")
|
|
}
|
|
session := loginUser(t, ownerName)
|
|
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
|
|
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/actions/runners/registration-token", ownerName, repoName)).AddTokenAuth(token)
|
|
resp := MakeRequest(t, req, http.StatusOK)
|
|
var registrationToken struct {
|
|
Token string `json:"token"`
|
|
}
|
|
DecodeJSON(t, resp, ®istrationToken)
|
|
r.doRegister(t, runnerName, registrationToken.Token, labels)
|
|
}
|
|
|
|
func (r *mockRunner) registerAsEphemeralRepoRunner(t *testing.T, ownerName, repoName, runnerName string, labels []string) {
|
|
if !setting.Database.Type.IsSQLite3() {
|
|
assert.FailNow(t, "registering a mock runner when using a database other than SQLite leaves leftovers")
|
|
}
|
|
session := loginUser(t, ownerName)
|
|
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
|
|
req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/actions/runners/registration-token", ownerName, repoName)).AddTokenAuth(token)
|
|
resp := MakeRequest(t, req, http.StatusOK)
|
|
var registrationToken struct {
|
|
Token string `json:"token"`
|
|
}
|
|
DecodeJSON(t, resp, ®istrationToken)
|
|
r.doRegisterEphemeral(t, runnerName, registrationToken.Token, labels)
|
|
}
|
|
|
|
func (r *mockRunner) maybeFetchTask(t *testing.T) *runnerv1.Task {
|
|
resp, err := r.client.runnerServiceClient.FetchTask(t.Context(), connect.NewRequest(&runnerv1.FetchTaskRequest{
|
|
TasksVersion: r.lastTasksVersion,
|
|
}))
|
|
require.NoError(t, err)
|
|
r.lastTasksVersion = resp.Msg.TasksVersion
|
|
return resp.Msg.Task
|
|
}
|
|
|
|
func (r *mockRunner) maybeFetchSingleTask(t *testing.T, handle *string) *runnerv1.Task {
|
|
resp, err := r.client.runnerServiceClient.FetchSingleTask(t.Context(), connect.NewRequest(&runnerv1.FetchSingleTaskRequest{
|
|
TasksVersion: r.lastTasksVersion,
|
|
Handle: handle,
|
|
}))
|
|
require.NoError(t, err)
|
|
r.lastTasksVersion = resp.Msg.TasksVersion
|
|
return resp.Msg.Task
|
|
}
|
|
|
|
func (r *mockRunner) fetchTask(t *testing.T, timeout ...time.Duration) *runnerv1.Task {
|
|
fetchTimeout := 10 * time.Second
|
|
if len(timeout) > 0 {
|
|
fetchTimeout = timeout[0]
|
|
}
|
|
|
|
var task *runnerv1.Task
|
|
require.Eventually(t, func() bool {
|
|
maybeTask := r.maybeFetchTask(t)
|
|
if maybeTask != nil {
|
|
task = maybeTask
|
|
return true
|
|
}
|
|
return false
|
|
}, fetchTimeout, time.Millisecond*100, "failed to fetch a task")
|
|
return task
|
|
}
|
|
|
|
func (r *mockRunner) maybeFetchMultipleTasks(t *testing.T, taskCapacity *int64) (*runnerv1.Task, []*runnerv1.Task) {
|
|
resp, err := r.client.runnerServiceClient.FetchTask(t.Context(), connect.NewRequest(&runnerv1.FetchTaskRequest{
|
|
TasksVersion: r.lastTasksVersion,
|
|
TaskCapacity: taskCapacity,
|
|
}))
|
|
require.NoError(t, err)
|
|
r.lastTasksVersion = resp.Msg.TasksVersion
|
|
return resp.Msg.Task, resp.Msg.AdditionalTasks
|
|
}
|
|
|
|
func (r *mockRunner) fetchMultipleTasks(t *testing.T, taskCapacity *int64, timeout ...time.Duration) (*runnerv1.Task, []*runnerv1.Task) {
|
|
fetchTimeout := 10 * time.Second
|
|
if len(timeout) > 0 {
|
|
fetchTimeout = timeout[0]
|
|
}
|
|
var task *runnerv1.Task
|
|
var additional []*runnerv1.Task
|
|
require.Eventually(t, func() bool {
|
|
maybeTask, maybeAdditional := r.maybeFetchMultipleTasks(t, taskCapacity)
|
|
if maybeTask != nil {
|
|
task = maybeTask
|
|
additional = maybeAdditional
|
|
return true
|
|
}
|
|
return false
|
|
}, fetchTimeout, time.Millisecond*100, "failed to fetch a task")
|
|
return task, additional
|
|
}
|
|
|
|
type mockTaskOutcome struct {
|
|
result runnerv1.Result
|
|
outputs map[string]string
|
|
logRows []*runnerv1.LogRow
|
|
}
|
|
|
|
func (r *mockRunner) execTask(t *testing.T, task *runnerv1.Task, outcome *mockTaskOutcome) {
|
|
for idx, lr := range outcome.logRows {
|
|
resp, err := r.client.runnerServiceClient.UpdateLog(t.Context(), connect.NewRequest(&runnerv1.UpdateLogRequest{
|
|
TaskId: task.Id,
|
|
Index: int64(idx),
|
|
Rows: []*runnerv1.LogRow{lr},
|
|
NoMore: idx == len(outcome.logRows)-1,
|
|
}))
|
|
require.NoError(t, err)
|
|
assert.EqualValues(t, idx+1, resp.Msg.AckIndex)
|
|
}
|
|
sentOutputKeys := make([]string, 0, len(outcome.outputs))
|
|
for outputKey, outputValue := range outcome.outputs {
|
|
resp, err := r.client.runnerServiceClient.UpdateTask(t.Context(), connect.NewRequest(&runnerv1.UpdateTaskRequest{
|
|
State: &runnerv1.TaskState{
|
|
Id: task.Id,
|
|
Result: runnerv1.Result_RESULT_UNSPECIFIED,
|
|
},
|
|
Outputs: map[string]string{outputKey: outputValue},
|
|
}))
|
|
require.NoError(t, err)
|
|
sentOutputKeys = append(sentOutputKeys, outputKey)
|
|
assert.ElementsMatch(t, sentOutputKeys, resp.Msg.SentOutputs)
|
|
}
|
|
resp, err := r.client.runnerServiceClient.UpdateTask(t.Context(), connect.NewRequest(&runnerv1.UpdateTaskRequest{
|
|
State: &runnerv1.TaskState{
|
|
Id: task.Id,
|
|
Result: outcome.result,
|
|
StoppedAt: timestamppb.Now(),
|
|
},
|
|
}))
|
|
require.NoError(t, err)
|
|
assert.Equal(t, outcome.result, resp.Msg.State.Result)
|
|
}
|
|
|
|
// Simply pretend we're running the task and succeed at that.
|
|
// We're that great!
|
|
func (r *mockRunner) succeedAtTask(t *testing.T, task *runnerv1.Task) {
|
|
resp, err := r.client.runnerServiceClient.UpdateTask(t.Context(), connect.NewRequest(&runnerv1.UpdateTaskRequest{
|
|
State: &runnerv1.TaskState{
|
|
Id: task.Id,
|
|
Result: runnerv1.Result_RESULT_SUCCESS,
|
|
StoppedAt: timestamppb.Now(),
|
|
},
|
|
}))
|
|
require.NoError(t, err)
|
|
assert.Equal(t, runnerv1.Result_RESULT_SUCCESS, resp.Msg.State.Result)
|
|
}
|
|
|
|
// Pretend we're running the task, do nothing and fail at that.
|
|
func (r *mockRunner) failAtTask(t *testing.T, task *runnerv1.Task) {
|
|
resp, err := r.client.runnerServiceClient.UpdateTask(t.Context(), connect.NewRequest(&runnerv1.UpdateTaskRequest{
|
|
State: &runnerv1.TaskState{
|
|
Id: task.Id,
|
|
Result: runnerv1.Result_RESULT_FAILURE,
|
|
StoppedAt: timestamppb.Now(),
|
|
},
|
|
}))
|
|
require.NoError(t, err)
|
|
assert.Equal(t, runnerv1.Result_RESULT_FAILURE, resp.Msg.State.Result)
|
|
}
|