fix: pin native exports to stage execution service

This commit is contained in:
2026-10-20 21:46:42 +01:00
parent 1f867d4827
commit bb98bde4fc
20 changed files with 420 additions and 74 deletions
+3
View File
@@ -81,6 +81,7 @@ esac
t.Fatal(err)
}
t.Setenv("PIPELINES_OPENCODE", executable)
localExportService(t, "http://127.0.0.1:1")
store, err := pipeline.Open(filepath.Join(dir, "runs.db"))
if err != nil {
t.Fatal(err)
@@ -446,6 +447,7 @@ esac
t.Fatal(err)
}
t.Setenv("PIPELINES_OPENCODE", executable)
localExportService(t, "http://127.0.0.1:1")
store, err := pipeline.Open(filepath.Join(dir, "runs.db"))
if err != nil {
t.Fatal(err)
@@ -533,6 +535,7 @@ func TestReadOnlyStageRetriesPostAdmissionTransportButMutatingStageDoesNot(t *te
dir := t.TempDir()
executable := filepath.Join(dir, "opencode")
t.Setenv("PIPELINES_OPENCODE", executable)
localExportService(t, "http://127.0.0.1:1")
scriptTemplate := `#!/bin/sh
if [ "$1" = "--help" ]; then echo ' api'; exit 0; fi
printf '%s %s\n' "$2" "$3" >> "@STATE@/calls"
+1 -8
View File
@@ -13,7 +13,6 @@ import (
"testing"
"time"
"git.a-wan.net/alan/pipelines/internal/opencode"
"git.a-wan.net/alan/pipelines/internal/pipeline"
"git.a-wan.net/alan/pipelines/internal/stage"
)
@@ -78,7 +77,6 @@ func TestAutomaticSessionExportRecoveryTransientThenComplete(t *testing.T) {
func TestAutomaticSessionExportRecoveryWrongSessionExhaustsNeverClean(t *testing.T) {
h, s, id := recoveryRunner(t)
ctx := context.Background()
dir := t.TempDir()
var calls atomic.Int32
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
user, password, ok := r.BasicAuth()
@@ -95,12 +93,7 @@ func TestAutomaticSessionExportRecoveryWrongSessionExhaustsNeverClean(t *testing
w.Write([]byte(`{"info":{"id":"ses_wrong"},"messages":[{"info":{"role":"assistant"},"parts":[{"type":"text","text":"wrong"}]}]}`))
}))
t.Cleanup(srv.Close)
passwordFile := filepath.Join(dir, "password")
if err := os.WriteFile(passwordFile, []byte("fixture-password"), 0600); err != nil {
t.Fatal(err)
}
t.Setenv(opencode.EndpointEnvKey, srv.URL)
t.Setenv(opencode.EndpointPasswordFileEnvKey, passwordFile)
localExportService(t, srv.URL)
h.runner.exportSession = stage.ExportSession
for range 3 {
job, _ := s.SessionExportJob(ctx, id, 1)
+17 -5
View File
@@ -2,6 +2,7 @@ package server
import (
"context"
"encoding/json"
"errors"
"fmt"
"io"
@@ -54,13 +55,24 @@ func sessionExportCLI(t *testing.T) {
fmt.Fprint(w, `{"data":`+sessionExportBody+`}`)
}))
t.Cleanup(srv.Close)
passwordPath := filepath.Join(t.TempDir(), "password")
if err := os.WriteFile(passwordPath, []byte("fixture-password"), 0600); err != nil {
localExportService(t, srv.URL)
t.Setenv(opencode.EndpointEnvKey, "http://127.0.0.1:1")
t.Setenv(opencode.EndpointPasswordFileEnvKey, "")
t.Setenv(opencode.EndpointUsernameEnvKey, "")
}
func localExportService(t *testing.T, endpoint string) {
t.Helper()
t.Setenv("XDG_CACHE_HOME", t.TempDir())
state := t.TempDir()
t.Setenv(opencode.OpenCodeServiceStateEnvKey, state)
if err := os.Mkdir(filepath.Join(state, "opencode"), 0700); err != nil {
t.Fatal(err)
}
data, _ := json.Marshal(map[string]string{"url": endpoint, "password": "fixture-password"})
if err := os.WriteFile(filepath.Join(state, "opencode", "service.json"), data, 0600); err != nil {
t.Fatal(err)
}
t.Setenv(opencode.EndpointEnvKey, srv.URL)
t.Setenv(opencode.EndpointPasswordFileEnvKey, passwordPath)
t.Setenv(opencode.EndpointUsernameEnvKey, "")
}
// sessionExportRunner runs one stage that records a session for the run, so the
+1
View File
@@ -56,6 +56,7 @@ esac
t.Fatal(err)
}
t.Setenv("PIPELINES_OPENCODE", executable)
localExportService(t, "http://127.0.0.1:1")
store, err := pipeline.Open(filepath.Join(dir, "runs.db"))
if err != nil {
t.Fatal(err)
+1
View File
@@ -49,6 +49,7 @@ esac
t.Fatal(err)
}
t.Setenv("PIPELINES_OPENCODE", executable)
localExportService(t, "http://127.0.0.1:1")
store, err := pipeline.Open(filepath.Join(dir, "runs.db"))
if err != nil {
t.Fatal(err)
+1
View File
@@ -86,6 +86,7 @@ esac
t.Fatal(err)
}
t.Setenv("PIPELINES_OPENCODE", exe)
localExportService(t, "http://127.0.0.1:1")
}
func budgetPipeline(t *testing.T, ctx context.Context, store *pipeline.Store, names []string, configs string) {