T8947: migrate remaining current→rolling residuals (rolling branch) - #1206
Conversation
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)
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository YAML (base), Central YAML (inherited), Organization UI (inherited) Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (8)
📜 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)
🧰 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)
📝 WalkthroughSummary by CodeRabbit
WalkthroughThis PR migrates all references from the deprecated ChangesCurrent to Rolling branch migration
Possibly related PRs
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches✨ Simplify code
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. Comment |
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)
|
CI integration ❌ failed! Details
|
Adversarial review —
|
What
Post-1c the default branch is
rolling, but several build-config values on this branch still referenced the oldcurrentrepo path / codename / train identity. These break the rolling ISO build (and one already breaks version-string generation today).docker/vyos-dev.listrepositories/current current→repositories/rolling rollingvyos/vyos-build:rolling; was producingHit/Err …/repositories/currenton package buildsdata/defaults.tomlvyos_mirror→repositories/rolling,vyos_branch→rolling,release_train→rollingbuild-vyos-imagechecks out vyos-1x atvyos_branch(currentno longer exists post-1c);vyos_mirror+vyos_branchform the ISO apt sourcedeb {vyos_mirror} {vyos_branch} main;release_trainis the apt pin codename + os-release identitydata/live-build-config/archives/vyos-dev.pref.chrootPin: release n=current→n=rollingCodename: rollingdata/versionscurrent→rollingbuild-vyos-imagelooks upversion_mapping[git_branch];git_branchisrolling, so thecurrentkey KeyErrored → version fell back to999.<timestamp>.github/config/smoketest-branches.jsoncurrent→rolling+ mirror +container_image→ rollingpackage-smoketest.ymllooks up.branches["${BRANCH}"]whereBRANCHis the branch name (rolling); was returning null → "no config"Verified against the live repo:
https://packages.vyos.net/repositories/rollingpublishesSuite: rolling,Codename: rolling,Components: main.os-release impact (intended)
release_trainfeeds/etc/os-release, so rolling images will now reportVERSION_CODENAME=rollingand(rolling)inPRETTY_NAME/VERSION(wascurrent). The-rollingversion suffix is hardcoded inbuild-vyos-imageand is unaffected.Follow-up (not in this PR)
docker/vyos-dev.listis baked into thevyos/vyos-build:rollingimage — 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