From e7c1d364c3b17f9b266d0952abd21b464d5610af Mon Sep 17 00:00:00 2001
From: Zoltan Papp <zoltan.pmail@gmail.com>
Date: Mon, 15 Jun 2026 17:22:40 +0200
Subject: [PATCH] [management] treat ci- builds as development for remote jobs
 (#6436)

* fix(management): treat ci- builds as development for remote jobs

CI snapshot builds use a "ci-<sha>" version string that did not match
IsDevelopmentVersion, so the remote-jobs minimum-version gate rejected
them. Recognize the "ci-" prefix as a development build.

* fix(management): treat dev- builds as development for remote jobs

Dev snapshot builds use a "dev-<sha>" version string that did not match
IsDevelopmentVersion, so the remote-jobs minimum-version gate rejected
them. Recognize the "dev-" prefix as a development build, alongside the
existing "ci-" prefix.
---
 version/version.go      | 17 ++++++++++++++---
 version/version_test.go |  2 ++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/version/version.go b/version/version.go
index f33ff133c..074305bd6 100644
--- a/version/version.go
+++ b/version/version.go
@@ -13,6 +13,14 @@ import (
 // string, so it must not change without coordinating those consumers.
 const DevelopmentVersion = "development"
 
+// CIVersionPrefix marks CI snapshot builds (e.g. "ci-7470fbdd"). Such builds
+// are treated as development versions by IsDevelopmentVersion.
+const CIVersionPrefix = "ci-"
+
+// DevVersionPrefix marks dev snapshot builds (e.g. "dev-7470fbdd"). Such builds
+// are treated as development versions by IsDevelopmentVersion.
+const DevVersionPrefix = "dev-"
+
 // will be replaced with the release version when using goreleaser
 var version = DevelopmentVersion
 
@@ -69,8 +77,11 @@ func NetbirdCommit() string {
 // comparing against the "development" literal or ad-hoc substring checks.
 //
 // Matches the bare DevelopmentVersion constant as well as any future
-// extension such as "development-<sha>" or "development-<sha>-dirty",
-// while excluding tagged prereleases like "v0.31.1-dev".
+// extension such as "development-<sha>" or "development-<sha>-dirty", and
+// CI/dev snapshot builds prefixed with "ci-" or "dev-", while excluding
+// tagged prereleases like "v0.31.1-dev".
 func IsDevelopmentVersion(v string) bool {
-	return strings.HasPrefix(v, DevelopmentVersion)
+	return strings.HasPrefix(v, DevelopmentVersion) ||
+		strings.HasPrefix(v, CIVersionPrefix) ||
+		strings.HasPrefix(v, DevVersionPrefix)
 }
diff --git a/version/version_test.go b/version/version_test.go
index 47b77b50d..cdba6b804 100644
--- a/version/version_test.go
+++ b/version/version_test.go
@@ -10,6 +10,8 @@ func TestIsDevelopmentVersion(t *testing.T) {
 		{"development", true},
 		{"development-0823f3ff9ab1", true},
 		{"development-0823f3ff9ab1-dirty", true},
+		{"ci-7470fbdd", true},
+		{"dev-7470fbdd", true},
 		{"0.50.0", false},
 		{"v0.31.1-dev", false},
 		{"1.0.0-dev", false},