Skip to content

bug/release: fix test to work during internal release build#889

Merged
DaedalusG merged 1 commit into
mainfrom
wg/plat/fix-helm-test-for-release
Jun 11, 2026
Merged

bug/release: fix test to work during internal release build#889
DaedalusG merged 1 commit into
mainfrom
wg/plat/fix-helm-test-for-release

Conversation

@DaedalusG

Copy link
Copy Markdown
Contributor

Fix tests introduced in #885 to work during the release flow.

This test broke the release for the internal build #888

Checklist

Test plan

@DaedalusG DaedalusG requested review from a team and michaellzc June 11, 2026 00:37
@DaedalusG DaedalusG added the backport 7.4.x Backport to 7.4.x release branch label Jun 11, 2026
@DaedalusG DaedalusG merged commit 8db7e22 into main Jun 11, 2026
6 checks passed
@DaedalusG DaedalusG deleted the wg/plat/fix-helm-test-for-release branch June 11, 2026 00:42
@sourcegraph-release-bot

Copy link
Copy Markdown
Collaborator

The backport to 7.4.x failed at https://github.com/sourcegraph/deploy-sourcegraph-helm/actions/runs/27315964453:

Reviews may only be requested from collaborators. One or more of the teams you specified is not a collaborator of the sourcegraph/deploy-sourcegraph-helm repository.

To backport this PR manually, you can either:

Via the sg tool

Use the sg backport command to backport your commit to the release branch.

sg backport -r 7.4.x -p 889
Via your terminal

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.4.x 7.4.x
# Navigate to the new working tree
cd .worktrees/backport-7.4.x
# Create a new branch
git switch --create backport-889-to-7.4.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8db7e22913bbbd0dbde298b8f6c0818a82d8f7b3
# Push it to GitHub
git push --set-upstream origin backport-889-to-7.4.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.4.x

If you encouter conflict, first resolve the conflict and stage all files, then run the commands below:

git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-889-to-7.4.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.4.x
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is 7.4.x and the compare/head branch is backport-889-to-7.4.x., click here to create the pull request.

Once the pull request has been created, please ensure the following:

  • Make sure to tag @sourcegraph/release in the pull request description.

  • kindly remove the release-blocker from this pull request.

DaedalusG added a commit that referenced this pull request Jun 11, 2026
…e build (#890)

Backport 8db7e22 from #889

Fix tests introduced in
#885 to work
during the release flow.

This test broke the release for the internal build
#888

### Checklist

- [ ] Follow the [manual testing
process](https://github.com/sourcegraph/deploy-sourcegraph-helm/blob/main/TEST.md)
- [ ] Update
[changelog](https://github.com/sourcegraph/deploy-sourcegraph-helm/blob/main/charts/sourcegraph/CHANGELOG.md)
- [ ] Update [Kubernetes update
doc](https://docs.sourcegraph.com/admin/updates/kubernetes)

### Test plan

Co-authored-by: Warren Gifford <warrenbruceg@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants