summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuriy Andamasov <yuriy@vyos.io>2026-06-02 17:25:44 +0300
committerYuriy Andamasov <yuriy@vyos.io>2026-06-02 17:25:44 +0300
commit5c11c47aba038773261b14e451c41e021de3a4f1 (patch)
tree27068a82e03fc3e8fa5acc4b9abd32d4aeeb600c
parente238afbd6bc272b02b426f1b16fe8d16f6069c05 (diff)
downloadvyos-1x-5c11c47aba038773261b14e451c41e021de3a4f1.tar.gz
vyos-1x-5c11c47aba038773261b14e451c41e021de3a4f1.zip
ci: T8943: complete current->rolling branch-ref migration (rollout 1c follow-up)
Rollout 1c PR #5241 renamed the default branch current->rolling and updated the 7 workflow files, but missed two files that still referenced the old branch name: - .github/config/smoketest-branches.json: the branch config is keyed by github.ref_name. package-smoketest.yml already triggers on `rolling`, then looks up `.branches["rolling"]`, which returned null -> the workflow errored out ("No smoketest configuration found for branch 'rolling'") on every push and PR to the rolling branch. Rename the key current->rolling. The entry's vyos_mirror and container_image are also moved to the now-canonical `rolling` release stream (packages.vyos.net/repositories/rolling/, vyos/vyos-build:rolling -- both live; the rolling docker tag is actively rebuilt while `current` froze at 2026-03-27), matching the self-consistent circinus/sagitta entries where key == mirror == image == branch name. - .github/PULL_REQUEST_TEMPLATE.md: two github.com/vyos/vyos-1x/{blob,tree}/current/ links repointed to /rolling/ (the default branch). A full-repo scan confirmed no other current->rolling git-branch references remain; all other "current" occurrences are the VyOS release-stream/version/ config vocabulary and are intentionally left unchanged. 🤖 Generated by [robots](https://vyos.io)
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md4
-rw-r--r--.github/config/smoketest-branches.json6
2 files changed, 5 insertions, 5 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index fadbebdc9..37dda45bc 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -45,9 +45,9 @@ test_01_simple_options (__main__.TestFeature.test_01_simple_options) ... ok
<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
<!--- The entire development process is outlined here: https://docs.vyos.io/en/latest/contributing/development.html -->
-- [ ] I have read the [**CONTRIBUTING**](https://github.com/vyos/vyos-1x/blob/current/CONTRIBUTING.md) document
+- [ ] I have read the [**CONTRIBUTING**](https://github.com/vyos/vyos-1x/blob/rolling/CONTRIBUTING.md) document
- [ ] I have linked this PR to one or more Phabricator Task(s)
-- [ ] I have run the components [**SMOKETESTS**](https://github.com/vyos/vyos-1x/tree/current/smoketest/scripts/cli) if applicable
+- [ ] I have run the components [**SMOKETESTS**](https://github.com/vyos/vyos-1x/tree/rolling/smoketest/scripts/cli) if applicable
- [ ] My commit headlines contain a valid Task id
- [ ] My change requires a change to the documentation
- [ ] I have updated the documentation accordingly
diff --git a/.github/config/smoketest-branches.json b/.github/config/smoketest-branches.json
index 710ba5207..1921375a8 100644
--- a/.github/config/smoketest-branches.json
+++ b/.github/config/smoketest-branches.json
@@ -1,8 +1,8 @@
{
"branches": {
- "current": {
- "vyos_mirror": "https://packages.vyos.net/repositories/current/",
- "container_image": "vyos/vyos-build:current",
+ "rolling": {
+ "vyos_mirror": "https://packages.vyos.net/repositories/rolling/",
+ "container_image": "vyos/vyos-build:rolling",
"vyos_build_repo": "vyos/vyos-build",
"use_pat": false,
"build_runner": ["ubuntu-24.04"],