diff --git a/cmd/ate-setup/internal/steps/version.go b/cmd/ate-setup/internal/steps/version.go index 00ebbaee2..9e0413f30 100644 --- a/cmd/ate-setup/internal/steps/version.go +++ b/cmd/ate-setup/internal/steps/version.go @@ -48,7 +48,9 @@ func (e *Env) SubstrateVersion() (version, suffix string, err error) { if e.Cfg.Images.IsPrebuilt() { raw = os.Getenv("VERSION") if raw == "" { - raw = e.Cfg.Images.Tag + // The tag may carry its digest (v1@sha256:...); the version + // is the tag alone. + raw, _, _ = strings.Cut(e.Cfg.Images.Tag, "@") } } else { // ko.BuildVersion consults VERSION itself before `git describe`. diff --git a/cmd/ate-setup/internal/steps/version_test.go b/cmd/ate-setup/internal/steps/version_test.go index 3391eb176..d0772c109 100644 --- a/cmd/ate-setup/internal/steps/version_test.go +++ b/cmd/ate-setup/internal/steps/version_test.go @@ -37,6 +37,11 @@ func TestSubstrateVersionPrebuilt(t *testing.T) { source: images.Source{Repo: "example.com/substrate", Tag: "v0.0.0-503-4b3423c0"}, want: "v0.0.0-503-4b3423c0", wantSuffix: "v0-0-0-503-4b3423c0", + }, { + name: "a tag carrying its digest is the version without it", + source: images.Source{Repo: "example.com/substrate", Tag: "v0.0.0@sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"}, + want: "v0.0.0", + wantSuffix: "v0-0-0", }, { name: "built from source falls back to git", source: images.Source{},