Skip to content

Only enable ansible/yaml lint tests when playbooks are built #7099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 10, 2021
Merged

Only enable ansible/yaml lint tests when playbooks are built #7099

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3435288
Only enable ansible/yaml lint tests when playbooks are built.
ggbecker Jun 8, 2021
dd273ee
Guard ansible syntax check test on playbooks per profile with CMake o…
ggbecker Jun 10, 2021
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
38 changes: 27 additions & 11 deletions cmake/SSGCommon.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,24 +302,40 @@ macro(ssg_build_remediations PRODUCT)
if ("${PRODUCT_ANSIBLE_REMEDIATION_ENABLED}")
# only enable the ansible syntax checks if we are using openscap 1.2.17 or higher
# older openscap causes syntax errors, see https://github.com/OpenSCAP/openscap/pull/977
if (ANSIBLE_PLAYBOOK_EXECUTABLE AND "${OSCAP_VERSION}" VERSION_GREATER "1.2.16")
if (SSG_ANSIBLE_PLAYBOOKS_ENABLED AND ANSIBLE_PLAYBOOK_EXECUTABLE AND "${OSCAP_VERSION}" VERSION_GREATER "1.2.16")
add_test(
NAME "ansible-playbook-syntax-check-${PRODUCT}"
COMMAND "${CMAKE_SOURCE_DIR}/tests/ansible_playbook_check.sh" "${ANSIBLE_PLAYBOOK_EXECUTABLE}" "${CMAKE_BINARY_DIR}/ansible" "${PRODUCT}"
)
endif()
if (ANSIBLE_CHECKS)
if (ANSIBLE_LINT_EXECUTABLE AND "${OSCAP_VERSION}" VERSION_GREATER "1.2.16")
add_test(
NAME "ansible-playbook-ansible-lint-check-${PRODUCT}"
COMMAND "${CMAKE_SOURCE_DIR}/tests/ansible_playbook_check.sh" "${ANSIBLE_LINT_EXECUTABLE}" "${CMAKE_BINARY_DIR}/${PRODUCT}/playbooks" "${CMAKE_SOURCE_DIR}/tests/ansible-lint_config.yml"
)
if (SSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED)
if (ANSIBLE_LINT_EXECUTABLE)
add_test(
NAME "ansible-playbook-per-rule-ansible-lint-check-${PRODUCT}"
COMMAND "${CMAKE_SOURCE_DIR}/tests/ansible_playbook_check.sh" "${ANSIBLE_LINT_EXECUTABLE}" "${CMAKE_BINARY_DIR}/${PRODUCT}/playbooks" "${CMAKE_SOURCE_DIR}/tests/ansible-lint_config.yml"
)
endif()
if (YAMLLINT_EXECUTABLE)
add_test(
NAME "ansible-playbook-per-rule-yamllint-check-${PRODUCT}"
COMMAND "${CMAKE_SOURCE_DIR}/tests/ansible_playbook_check.sh" "${YAMLLINT_EXECUTABLE}" "${CMAKE_BINARY_DIR}/${PRODUCT}/playbooks" "${CMAKE_SOURCE_DIR}/tests/yamllint_config.yml"
)
endif()
endif()
if (YAMLLINT_EXECUTABLE AND "${OSCAP_VERSION}" VERSION_GREATER "1.2.16")
add_test(
NAME "ansible-playbook-yamllint-check-${PRODUCT}"
COMMAND "${CMAKE_SOURCE_DIR}/tests/ansible_playbook_check.sh" "${YAMLLINT_EXECUTABLE}" "${CMAKE_BINARY_DIR}/${PRODUCT}/playbooks" "${CMAKE_SOURCE_DIR}/tests/yamllint_config.yml"
)
if (SSG_ANSIBLE_PLAYBOOKS_ENABLED)
if (ANSIBLE_LINT_EXECUTABLE AND "${OSCAP_VERSION}" VERSION_GREATER "1.2.16")
add_test(
NAME "ansible-playbook-per-profile-ansible-lint-check-${PRODUCT}"
COMMAND "${CMAKE_SOURCE_DIR}/tests/ansible_playbook_check.sh" "${ANSIBLE_LINT_EXECUTABLE}" "${CMAKE_BINARY_DIR}/ansible" "${CMAKE_SOURCE_DIR}/tests/ansible-lint_config.yml"
)
endif()
if (YAMLLINT_EXECUTABLE AND "${OSCAP_VERSION}" VERSION_GREATER "1.2.16")
add_test(
NAME "ansible-playbook-per-profile-yamllint-check-${PRODUCT}"
COMMAND "${CMAKE_SOURCE_DIR}/tests/ansible_playbook_check.sh" "${YAMLLINT_EXECUTABLE}" "${CMAKE_BINARY_DIR}/ansible" "${CMAKE_SOURCE_DIR}/tests/yamllint_config.yml"
)
endif()
endif()
endif()
endif()
Expand Down