Skip to content

T8947: migrate remaining current→rolling residuals (rolling branch) - #1206

Merged
andamasov merged 2 commits into
rollingfrom
claude/is504-vyos-build-rolling-residuals
May 31, 2026
Merged

T8947: migrate remaining current→rolling residuals (rolling branch)#1206
andamasov merged 2 commits into
rollingfrom
claude/is504-vyos-build-rolling-residuals

Conversation

@andamasov

@andamasov andamasov commented May 31, 2026

Copy link
Copy Markdown
Member

What

Post-1c the default branch is rolling, but several build-config values on this branch still referenced the old current repo path / codename / train identity. These break the rolling ISO build (and one already breaks version-string generation today).

File Change Why
docker/vyos-dev.list repositories/current currentrepositories/rolling rolling apt source baked into vyos/vyos-build:rolling; was producing Hit/Err …/repositories/current on package builds
data/defaults.toml vyos_mirrorrepositories/rolling, vyos_branchrolling, release_trainrolling build-vyos-image checks out vyos-1x at vyos_branch (current no longer exists post-1c); vyos_mirror+vyos_branch form the ISO apt source deb {vyos_mirror} {vyos_branch} main; release_train is the apt pin codename + os-release identity
data/live-build-config/archives/vyos-dev.pref.chroot Pin: release n=currentn=rolling pin codename must match the repo Codename: rolling
data/versions key currentrolling build-vyos-image looks up version_mapping[git_branch]; git_branch is rolling, so the current key KeyErrored → version fell back to 999.<timestamp>
.github/config/smoketest-branches.json rolling entry key currentrolling + mirror + container_image → rolling package-smoketest.yml looks up .branches["${BRANCH}"] where BRANCH is the branch name (rolling); was returning null → "no config"

Verified against the live repo: https://packages.vyos.net/repositories/rolling publishes Suite: rolling, Codename: rolling, Components: main.

os-release impact (intended)

release_train feeds /etc/os-release, so rolling images will now report VERSION_CODENAME=rolling and (rolling) in PRETTY_NAME/VERSION (was current). The -rolling version suffix is hardcoded in build-vyos-image and is unaffected.

Follow-up (not in this PR)

docker/vyos-dev.list is baked into the vyos/vyos-build:rolling image — the image must be rebuilt + re-pushed for the apt-source fix to take effect on runners.

Companion to Rollout 1c (T8943). Ref IS-504.

🤖 Generated by robots

Post-1c the default branch is `rolling`, but several build-config values
on this branch still referenced the old `current` repo path / codename /
train identity. These are not cosmetic — they break the rolling ISO build:

- docker/vyos-dev.list: apt source baked into vyos/vyos-build:rolling still
  pointed at repositories/current (Hit/Err on package builds). Now
  repositories/rolling + codename `rolling` (verified against live repo:
  Suite/Codename `rolling`, Components `main`).
- data/defaults.toml: vyos_mirror → repositories/rolling; vyos_branch →
  rolling (build-vyos-image checks out vyos-1x at this branch — `current`
  no longer exists post-1c); release_train → rolling (apt pin codename +
  os-release identity).
- data/live-build-config/archives/vyos-dev.pref.chroot: Pin codename
  n=rolling to match the repo.
- data/versions: key current→rolling. build-vyos-image looks up
  version_mapping[git_branch]; git_branch is `rolling`, so the `current`
  key KeyErrored and the version fell back to 999.<timestamp>.
- .github/config/smoketest-branches.json: rolling-train entry key
  current→rolling (looked up by branch name; was already 404ing on
  rolling) + mirror + container_image to rolling.

os-release impact (intended): rolling images now report
VERSION_CODENAME=rolling and "(rolling)" in PRETTY_NAME/VERSION. The
-rolling version suffix is hardcoded and unaffected.

Companion to Rollout 1c (T8943). Ref IS-504.

🤖 Generated by [robots](https://vyos.io)
@coderabbitai

coderabbitai Bot commented May 31, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited), Organization UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: 98479fdc-43fd-41a6-a58b-7e37b0b533b3

📥 Commits

Reviewing files that changed from the base of the PR and between 95dcc2f and 259de77.

📒 Files selected for processing (8)
  • .github/PULL_REQUEST_TEMPLATE.md
  • .github/config/smoketest-branches.json
  • README.md
  • data/defaults.toml
  • data/live-build-config/archives/vyos-dev.pref.chroot
  • data/versions
  • docker/Dockerfile
  • docker/vyos-dev.list
📜 Recent review details
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (3)
  • GitHub Check: codeql-analysis-call / Analyze (python)
  • GitHub Check: Mergify Merge Protections
  • GitHub Check: Summary
🧰 Additional context used
🪛 GitHub Actions: VyOS ISO Integration Test / 3_set_config.txt
.github/config/smoketest-branches.json

[error] 1-1: No smoketest configuration found for branch 'rolling' in .github/config/smoketest-branches.json

🪛 GitHub Actions: VyOS ISO Integration Test / set_config
.github/config/smoketest-branches.json

[error] 1-1: No smoketest configuration found for branch 'rolling' in .github/config/smoketest-branches.json.

🔇 Additional comments (8)
README.md (1)

52-56: LGTM!

.github/PULL_REQUEST_TEMPLATE.md (1)

48-48: LGTM!

.github/config/smoketest-branches.json (1)

3-5: LGTM!

data/defaults.toml (1)

12-15: LGTM!

docker/Dockerfile (1)

34-34: LGTM!

Also applies to: 36-36, 38-38

data/live-build-config/archives/vyos-dev.pref.chroot (1)

2-2: LGTM!

docker/vyos-dev.list (1)

1-1: LGTM!

data/versions (1)

2-2: LGTM!


📝 Walkthrough

Summary by CodeRabbit

  • Chores

    • Updated build configurations and repository references to use the rolling branch and distribution
    • Updated APT repository and release version mappings to rolling equivalents
    • Updated container image tag documentation
  • Documentation

    • Updated README to document rolling as the default development branch with current code

Walkthrough

This PR migrates all references from the deprecated current release train to rolling across documentation, build configuration, package management, and Docker artifacts. Eight configuration and reference files are updated consistently to point build processes, contributors, and deployment tooling to the new default development branch.

Changes

Current to Rolling branch migration

Layer / File(s) Summary
Documentation and contributor guidance
README.md, .github/PULL_REQUEST_TEMPLATE.md
README "Development Branches" section documents rolling as the default branch and describes LTS backporting; PR template CONTRIBUTING link switches to rolling branch URL.
Build system and deployment configuration
.github/config/smoketest-branches.json, data/defaults.toml, docker/Dockerfile
Smoketest configuration replaces current branch entry with rolling, including mirror URL and container image; default build parameters switch vyos_branch and release_train to rolling; Docker build examples reference vyos-build:rolling* image tags.
Package management and APT configuration
data/live-build-config/archives/vyos-dev.pref.chroot, docker/vyos-dev.list, data/versions
APT pin preference and repository list update from current to rolling distribution; version data key mapping changes from current to rolling.

Possibly related PRs

  • vyos/vyos-build#1204: Parallel migration of currentrolling in GitHub Actions workflow branch triggers.
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed Title clearly identifies the main change: migrating current to rolling branch references across build config files.
Description check ✅ Passed Description is comprehensive and directly related to the changeset, detailing specific file changes, rationale, verification, and intended impact.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
✨ Simplify code
  • Create PR with simplified code
  • Commit simplified code in branch claude/is504-vyos-build-rolling-residuals

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@mergify mergify Bot added the rolling label May 31, 2026
Address adversarial-review findings (Codex) — stale current refs on the
rolling branch outside build config:

- .github/PULL_REQUEST_TEMPLATE.md: CONTRIBUTING link vyos-1x/blob/current
  → blob/rolling (was a broken link — vyos-1x renamed current→rolling in 1c).
- README.md: "Development Branches" section described the default branch as
  `current`; updated to `rolling` (dropped the obsolete "may switch to main"
  note — the rename already happened, to rolling).
- docker/Dockerfile: build-example comments vyos-build:current* →
  vyos-build:rolling*.

Ref IS-504, companion to T8943.

🤖 Generated by [robots](https://vyos.io)
@github-actions

Copy link
Copy Markdown

CI integration ❌ failed!

Details

CI logs

  • Config tests ❌ failed

@andamasov

Copy link
Copy Markdown
Member Author

Adversarial review — 259de77ca7fa7f9222905b070bca0ef9af2637f0 — Codex + Gemini parallel

Gemini: APPROVE. Codex: 3 Low (all resolved).

  1. [Codex low — FIXED] .github/PULL_REQUEST_TEMPLATE.md:48 — CONTRIBUTING link pointed at vyos-1x/blob/current (a broken link post-1c; vyos-1x renamed current→rolling). Fixed → blob/rolling (commit 259de77c).
  2. [Codex low — FIXED] README.md:52,55,56 — "Development Branches" section still described the default branch as current. Fixed → rolling (dropped the obsolete "may switch to main" note — the rename already happened, to rolling).
  3. [Codex low — FIXED] docker/Dockerfile:34,36,38 — build-example comments tagged vyos-build:current*. Fixed → vyos-build:rolling*.
  4. [Gemini rec — PUSHBACK] trailing slash on smoketest-branches.json vyos_mirror vs none in defaults.toml. Not changed: the trailing slash is the pre-existing format shared by the circinus/sagitta sibling entries in the same file; removing it from only the rolling entry would create intra-file inconsistency. The two files are consumed by different code paths and neither is sensitive to the trailing slash here.

All build-config changes (the 5 original files) verified against the live repo (Suite/Codename: rolling, Components: main) and confirmed functionally required for the rolling ISO build (vyos-1x checkout branch, ISO apt source codename, apt pin codename, data/versions lookup key). Phase 0 CodeRabbit: 0 findings on both heads.

Verdicts: Gemini APPROVE · Codex's 3 findings fixed.

@andamasov
andamasov marked this pull request as ready for review May 31, 2026 14:57
@andamasov
andamasov merged commit 8f856a4 into rolling May 31, 2026
12 of 14 checks passed
@andamasov
andamasov deleted the claude/is504-vyos-build-rolling-residuals branch May 31, 2026 21:50
@vyos-bot vyos-bot Bot added mirror-initiated This PR initiated for mirror sync workflow mirror-failed This PR mirror has failed mirror-completed and removed mirror-initiated This PR initiated for mirror sync workflow mirror-failed This PR mirror has failed labels May 31, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

1 participant