Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ jobs:
cisco_sccfm_scripts/verify_ansible_collection.py \
cisco_sccfm_scripts/verify_clean_controller.py \
cisco_sccfm_scripts/verify_pypi_release.py \
cisco_sccfm_scripts/verify_public_release.py \
cisco_sccfm_scripts/verify_python_artifacts.py

- name: Test
Expand Down Expand Up @@ -378,6 +379,7 @@ jobs:
cisco_sccfm_scripts/verify_ansible_collection.py \
cisco_sccfm_scripts/verify_clean_controller.py \
cisco_sccfm_scripts/verify_pypi_release.py \
cisco_sccfm_scripts/verify_public_release.py \
cisco_sccfm_scripts/verify_python_artifacts.py
poetry run pytest --color=yes
poetry run check-doc-links
Expand Down
8 changes: 5 additions & 3 deletions cisco_sccfm_scripts/verify_clean_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
from dataclasses import dataclass
from pathlib import Path

from cisco_sccfm_scripts.verify_ansible_collection import verify_collection_artifact
from cisco_sccfm_scripts.verify_python_artifacts import verify_python_wheel

_ANSIBLE_CORE = "ansible-core>=2.20,<2.22"
_PROFILE_ERROR = "SCCFM profile 'default' not found"
_EXPECTED_MODULES = 49
Expand Down Expand Up @@ -271,6 +268,11 @@ def verify_clean_controller(
expected_version: str,
) -> tuple[int, int, str]:
"""Verify matching artifacts using no project code inside the clean controller."""
# Keep the controller helpers importable by the public-release smoke harness
# without requiring artifact-verification dependencies such as PyYAML.
from cisco_sccfm_scripts.verify_ansible_collection import verify_collection_artifact
from cisco_sccfm_scripts.verify_python_artifacts import verify_python_wheel

wheel_result = verify_python_wheel(wheel)
if wheel_result.version != expected_version:
raise CleanControllerVerificationError("wheel and collection versions do not match")
Expand Down
Loading