Skip to content

Update CI tools image tag to correct format (release-v2.9) - #7031

Merged
oleg-kozlyuk-grafana merged 3 commits into
grafana:release-v2.9from
oleg-kozlyuk-grafana:bump-tools-image-release-v2.9
Apr 22, 2026
Merged

Update CI tools image tag to correct format (release-v2.9)#7031
oleg-kozlyuk-grafana merged 3 commits into
grafana:release-v2.9from
oleg-kozlyuk-grafana:bump-tools-image-release-v2.9

Conversation

@oleg-kozlyuk-grafana

Copy link
Copy Markdown
Contributor

Summary

  • Updates TOOLS_IMAGE_TAG in build/tools.mk from main-8340a1d49 to main-2c55cd0-20260421-172344
  • The old tag was manually set during a CVE fix (update go version for CVE-2026-25679 #6779) in a format that doesn't match Renovate's regex, preventing auto-updates
  • The new tag restores the expected format (main-<7hex>-<YYYYMMDD>-<HHMMSS>) and includes Go 1.26.2

Context

See #7022 and #7030 for the full investigation. This is the release-v2.9 counterpart.

Test plan

  • CI passes (lint should work with the updated tools image)

🤖 Generated with Claude Code

The tag was manually set to main-8340a1d49 (wrong format) during a CVE
fix, breaking Renovate's regex-based auto-update. Update to the latest
image (main-2c55cd0-20260421-172344) which has Go 1.26.2 and restores
the format Renovate expects.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
The updated CI tools image's jsonnet binary outputs trailing newlines,
causing the mixin check to fail on files committed without them.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
… blockbuilder test

The livestore testLogger forwarded Log() to t.Log() without synchronization,
causing a data race when background goroutines logged after the test completed.
Added RWMutex + done flag so t.Cleanup stops the logger before tRunner finishes.

The blockbuilder test registered context cancel before newStore's t.TempDir(),
so in LIFO cleanup order TempDir was removed while the polling goroutine was
still running. Moved cancel + Shutdown registration after newStore.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@oleg-kozlyuk-grafana
oleg-kozlyuk-grafana merged commit 2fc8797 into grafana:release-v2.9 Apr 22, 2026
39 of 40 checks passed
@oleg-kozlyuk-grafana
oleg-kozlyuk-grafana deleted the bump-tools-image-release-v2.9 branch April 22, 2026 14:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

2 participants