Skip to content

Commit 8f856a4

Browse files
authored
T8947: migrate remaining current→rolling residuals (rolling branch) (#1206)
* T8947: migrate remaining current→rolling residuals on rolling branch 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) * T8947: finish current→rolling residuals in docs/Dockerfile examples 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)
1 parent 95dcc2f commit 8f856a4

8 files changed

Lines changed: 16 additions & 17 deletions

File tree

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ test_01_simple_options (__main__.TestFeature.test_01_simple_options) ... ok
4545
<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
4646
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
4747
<!--- The entire development process is outlined here: https://docs.vyos.io/en/latest/contributing/development.html -->
48-
- [ ] I have read the [**CONTRIBUTING**](https://github.com/vyos/vyos-1x/blob/current/CONTRIBUTING.md) document
48+
- [ ] I have read the [**CONTRIBUTING**](https://github.com/vyos/vyos-1x/blob/rolling/CONTRIBUTING.md) document
4949
- [ ] I have linked this PR to one or more Phabricator Task(s)
5050
- [ ] My commit headlines contain a valid Task id
5151
- [ ] My change requires a change to the documentation

.github/config/smoketest-branches.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"branches": {
3-
"current": {
4-
"vyos_mirror": "https://packages.vyos.net/repositories/current/",
5-
"container_image": "vyos/vyos-build:current",
3+
"rolling": {
4+
"vyos_mirror": "https://packages.vyos.net/repositories/rolling/",
5+
"container_image": "vyos/vyos-build:rolling",
66
"use_pat": false
77
},
88
"circinus": {

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,10 @@ be found in our [Documentation - Build VyOS](https://docs.vyos.io/en/latest/cont
4949

5050
# Development Branches
5151

52-
The default branch that contains the most recent VyOS code is called `current`.
53-
We may or may not eventually switch to `main`.
52+
The default branch that contains the most recent VyOS code is called `rolling`.
5453

55-
All new code goes to the `current` branch. When a new LTS release is ready for feature freeze, a
56-
new branch is created for the release, and new code from `current` is backported
54+
All new code goes to the `rolling` branch. When a new LTS release is ready for feature freeze, a
55+
new branch is created for the release, and new code from `rolling` is backported
5756
to the release branch as needed.
5857

5958
Post-1.2.0 branches are named after constellations sorted by area from smallest

data/defaults.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ debian_security_mirror = "http://deb.debian.org/debian-security"
99

1010
debian_archive_areas = "main contrib non-free non-free-firmware"
1111

12-
vyos_mirror = "https://packages.vyos.net/repositories/current"
12+
vyos_mirror = "https://packages.vyos.net/repositories/rolling"
1313

14-
vyos_branch = "current"
15-
release_train = "current"
14+
vyos_branch = "rolling"
15+
release_train = "rolling"
1616

1717
kernel_version = "6.18.33"
1818
kernel_flavor = "vyos"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Package: *
2-
Pin: release n=current
2+
Pin: release n=rolling
33
Pin-Priority: 999

data/versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"current": "1.5"
2+
"rolling": "1.5"
33
}

docker/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ RUN grep "VERSION_ID" /etc/os-release || (echo 'VERSION_ID="12"' >> /etc/os-rele
3131
# arm32v7/
3232
# arm64v8/
3333
# Example bo byukd natively:
34-
# docker build -t vyos-build:current .
34+
# docker build -t vyos-build:rolling .
3535
# Example to build on armhf:
36-
# docker build -t vyos-build:current-armhf --build-arg ARCH=arm32v7/ .
36+
# docker build -t vyos-build:rolling-armhf --build-arg ARCH=arm32v7/ .
3737
# Example to build on arm64:
38-
# docker build -t vyos-build:current-arm64 --build-arg ARCH=arm64v8/ .
38+
# docker build -t vyos-build:rolling-arm64 --build-arg ARCH=arm64v8/ .
3939

4040
# On some versions of docker the emulation framework is not installed by default and
4141
# you need to install qemu, qemu-user-static and register qemu inside docker manually using:

docker/vyos-dev.list

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
deb [signed-by=/usr/share/keyrings/vyos-dev-archive-keyring.asc] https://packages.vyos.net/repositories/current current main
1+
deb [signed-by=/usr/share/keyrings/vyos-dev-archive-keyring.asc] https://packages.vyos.net/repositories/rolling rolling main

0 commit comments

Comments
 (0)