Skip to content
Merged
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions pkg/e2etest/cleanup.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,16 @@ func CleanupStaleResources(ctx context.Context, client forge.Client, token, org
t.Logf("[cleanup] Warning: could not delete per-repo guard variable: %v", delErr)
}

// 8. Delete stale repo-level FULLSEND_MINT_URL variable from test-repo.
// Per-repo install drivers (e.g. cfmint) write this as a repo variable,
// which takes precedence over the org-level FULLSEND_MINT_URL set by
// admin install. Ephemeral preview mints (cfmint) are torn down at the
// end of their run, so a leaked repo variable points to a dead URL and
// breaks dispatch for any later run that reuses this org.
if delErr := client.DeleteRepoVariable(ctx, org, TestRepo, "FULLSEND_MINT_URL"); delErr != nil {
t.Logf("[cleanup] Warning: could not delete stale repo-level mint URL variable: %v", delErr)
}

t.Log("[cleanup] Stale resource scan complete")
}

Expand All @@ -117,6 +127,14 @@ func TeardownPerRepoInstall(ctx context.Context, client forge.Client, token, org
deleteBranch(ctx, token, org, repo, "fullsend/onboard", log)
deleteBranch(ctx, token, org, repo, "fullsend/offboard", log)
deleteShimWorkflow(ctx, token, org, repo, log)
// Delete the repo-level FULLSEND_MINT_URL variable written by
// per-repo install drivers. It takes precedence over org-level
// FULLSEND_MINT_URL, so leaving it behind breaks dispatch for any
// later run (e.g. an org-level admin install) that reuses this repo
// from a shared org pool.
if delErr := client.DeleteRepoVariable(ctx, org, repo, "FULLSEND_MINT_URL"); delErr != nil {
log.Logf("[cleanup] Warning: could not delete repo-level mint URL variable: %v", delErr)
}
prs, err := client.ListRepoPullRequests(ctx, org, repo)
if err != nil {
log.Logf("[cleanup] Warning: could not list PRs: %v", err)
Expand Down
Loading