diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-10-31 12:28:44 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2026-10-31 12:28:44 +0100 |
| commit | dff0f8193d46e2ab93e1801cb24b1cd052b8125e (patch) | |
| tree | d08c5174915926ce4e9c754f17602c4cf980e795 /scripts | |
| parent | 140b1c1a89431f28ee2401255e006d1f4f516af2 (diff) | |
| download | vyos-build-dff0f8193d46e2ab93e1801cb24b1cd052b8125e.tar.gz vyos-build-dff0f8193d46e2ab93e1801cb24b1cd052b8125e.zip | |
build: T9547: rolling images use the 999 default version instead of 1.5
A rolling build without an explicit version was named 1.5-rolling-<ts>,
so it could not be told apart from the 1.5 (circinus) release line.
Rolling is no longer mapped to a version number and now gets the default
999.<timestamp>, without a warning. The release branches sagitta (1.4),
circinus (1.5) and scutum (1.6) are mapped explicitly.
Branch Version
--------- ------------------------
rolling 999.202610310016
scutum 1.6-rolling-202610310016
sagitta 1.4-rolling-202610310016
circinus 1.5-rolling-202610310016
(unknown) 999.202610310016 (with warning)
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index 8ac5d4dc..469e4a3b 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -485,9 +485,12 @@ def build(): with open('../data/versions') as f: version_mapping = json.load(f) - branch_version = version_mapping[git_branch] - - version = "{0}-rolling-{1}".format(branch_version, build_timestamp) + # Branches without a mapping (e.g. rolling) use the default version + branch_version = version_mapping.get(git_branch) + if branch_version: + version = "{0}-rolling-{1}".format(branch_version, build_timestamp) + else: + version = "999.{0}".format(build_timestamp) except Exception as e: print("W: Could not build a version string specific to git branch, falling back to default: {0}".format(str(e))) version = "999.{0}".format(build_timestamp) |
