Merge branch 'vyos:current' into current

Author: ServerForge

.github/workflows/check-open-prs-conflict.yml

@@ -0,0 +1,17 @@
+name: "Open PRs Conflicts checker"
+on:
+  push:
+    branches:
+      - current
+      - sagitta
+      - circinus
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  check-pr-conflict-call:
+    uses: vyos/.github/.github/workflows/check-open-prs-conflict.yml@current
+    secrets: inherit

.github/workflows/cla-check.yml

@@ -0,0 +1,18 @@
+name: "CLA Check"
+
+permissions:
+  actions: write
+  contents: read
+  pull-requests: write
+  statuses: write
+
+on:
+  pull_request_target:
+    types: [opened, synchronize, closed]
+  issue_comment:
+    types: [created]
+
+jobs:
+  call-cla-assistant:
+    uses: vyos/vyos-cla-signatures/.github/workflows/cla-reusable.yml@current
+    secrets: inherit

.github/workflows/cleanup-mirror-pr-branch.yml

@@ -1,4 +1,4 @@
-name: Lint py code with ruff
+name: Python Lint (Darker + Ruff)
 on:
   pull_request_target:
     branches:
@@ -9,6 +9,6 @@ permissions:
   contents: read
 
 jobs:
-  ruff-lint:
-    uses: vyos/.github/.github/workflows/lint-with-ruff.yml@current
+  darker-ruff-lint:
+    uses: vyos/.github/.github/workflows/lint-with-darker-ruff.yml@current
     secrets: inherit

.github/workflows/lint-with-ruff.yml .github/workflows/darker-ruff-lint.yml.github/workflows/lint-with-ruff.yml renamed to .github/workflows/darker-ruff-lint.yml

@@ -49,7 +49,7 @@ jobs:
       - name: Generate ISO version string
         id: version
         run: |
-          echo "build_version=1.5-integration-$(date -u +%Y%m%d%H%M)" >> $GITHUB_OUTPUT
+          echo "build_version=$(date -u +%Y.%m.%d-%H%M-integration)" >> $GITHUB_OUTPUT
       - name: Build custom ISO image
         shell: bash
         run: |

.github/workflows/mirror-pr-and-sync.yml

@@ -0,0 +1,36 @@
+name: PR Mirror and Repo Sync
+
+on:
+  pull_request_target:
+    types: [closed]
+    branches: [current]
+  workflow_dispatch:
+    inputs:
+      sync_branch:
+        description: 'Branch to mirror'
+        required: true
+        default: 'current'
+        type: choice
+        options:
+          - current
+
+permissions:
+  pull-requests: write
+  contents: write
+  issues: write
+
+jobs:
+  call-pr-mirror-repo-sync:
+    if: |
+      github.repository_owner == 'vyos' &&
+      (
+        github.event_name == 'workflow_dispatch' ||
+        (github.event_name == 'pull_request_target' && github.event.pull_request.merged == true)
+      )
+    uses: vyos/.github/.github/workflows/pr-mirror-repo-sync.yml@current
+    with:
+      sync_branch: ${{ github.event.inputs.sync_branch || 'current' }}
+    secrets:
+      PAT: ${{ secrets.PAT }}
+      REMOTE_OWNER: ${{ secrets.REMOTE_OWNER }}
+      REMOTE_REPO: ${{ secrets.REMOTE_REPO }}

.github/workflows/package-smoketest.yml

@@ -146,15 +146,14 @@ data/component-versions.json
 python/vyos/xml_ref/cache.py
 python/vyos/xml_ref/pkg_cache/*_cache.py
 python/vyos/xml_ref/op_cache.py
+python/vyos/xml_ref/op_cache.json
 python/vyos/xml_ref/pkg_cache/*_op_cache.py
 data/reftree.cache
 # autogenerated vyos-configd JSON definition
 data/configd-include.json
 
 # autogenerated vyos-commitd protobuf files
-python/vyos/proto/*pb2.py
 python/vyos/proto/*.desc
-python/vyos/proto/vyconf_proto.py
 
 # We do not use pip
 Pipfile

.github/workflows/pr-mirror-repo-sync.yml

@@ -69,7 +69,7 @@ op_mode_definitions: $(op_xml_obj)
 
 	find $(BUILD_DIR)/op-mode-definitions/ -type f -name "*.xml" | xargs -I {} $(CURDIR)/scripts/build-command-op-templates {} $(CURDIR)/schema/op-mode-definition.rng $(OP_TMPL_DIR) || exit 1
 
-	$(CURDIR)/python/vyos/xml_ref/generate_op_cache.py --xml-dir $(BUILD_DIR)/op-mode-definitions || exit 1
+	$(CURDIR)/python/vyos/xml_ref/generate_op_cache.py --check-path-ambiguity --xml-dir $(BUILD_DIR)/op-mode-definitions || exit 1
 
 	# XXX: tcpdump, ping, traceroute and mtr must be able to recursivly call themselves as the
 	# options are provided from the scripts themselves
@@ -89,7 +89,14 @@ vyshim:
 	$(MAKE) -C $(SHIM_DIR)
 
 .PHONY: all
-all: clean libvyosconfig interface_definitions op_mode_definitions test j2lint vyshim generate-configd-include-json
+all: clean copyright libvyosconfig interface_definitions op_mode_definitions test j2lint vyshim generate-configd-include-json
+
+.PHONY: copyright
+copyright:
+	@if git grep -q -E "Copyright( \(C\))? (19|20)[0-9]{2}(-[0-9]{4})? VyOS maintainers"; then \
+		echo "Error: Legacy copyright notice found."; \
+		exit 1; \
+	fi
 
 .PHONY: clean
 clean:
@@ -100,7 +107,7 @@ clean:
 
 .PHONY: test
 test: generate-configd-include-json
-	set -e; python3 -m compileall -q -x '/vmware-tools/scripts/, /ppp/' .
+	set -e; python3 -m compileall -q -x '/vmware-tools/scripts/' .
 	PYTHONPATH=python/ python3 -m "nose" --with-xunit src --with-coverage --cover-erase --cover-xml --cover-package src/conf_mode,src/op_mode,src/completion,src/helpers,src/validators,src/tests --verbose
 
 .PHONY: check_migration_scripts_executable