Skip to content
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

Exclude EKS content from validation and scap_val SRC-329. #7985

Merged
merged 2 commits into from
Dec 9, 2021
Merged

Exclude EKS content from validation and scap_val SRC-329. #7985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0b6c46
Exclude EKS content from validation and scap_val SRC-329.
ggbecker Dec 9, 2021
273d85d
Add EKS to Fedora gating build/test.
ggbecker Dec 9, 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
3 changes: 2 additions & 1 deletion .github/workflows/gate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ jobs:
sle12 \
sle15 \
ubuntu2004 \
ocp4
ocp4 \
eks
env:
ADDITIONAL_CMAKE_OPTIONS: "-DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED=ON"
- name: Test
Expand Down
2 changes: 1 addition & 1 deletion cmake/SSGCommon.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ set(SSG_HTML_TABLE_FILE_LIST "")
macro(define_validate_product PRODUCT)
set(VALIDATE_PRODUCT TRUE)
if ("${OSCAP_VERSION}" VERSION_LESS "1.4.0")
if ("${PRODUCT}" MATCHES "^(ocp4|ANOTHER_PROBLEMATIC_PRODUCT)$")
if ("${PRODUCT}" MATCHES "^(ocp4|eks|ANOTHER_PROBLEMATIC_PRODUCT)$")
message(STATUS "Won't validate ${PRODUCT}, as it requires the OpenSCAP scanner that is capable of the validation.")
set(VALIDATE_PRODUCT FALSE)
endif ()
Expand Down
2 changes: 1 addition & 1 deletion tests/run_scapval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def process_results(result_path):
id_ = base_req.get("id")
status = base_req.find("./{%s}status" % scapval_results_ns).text
if status == "FAIL":
if 'ssg-ocp4-ds' in result_path and id_ == "SRC-329":
if ('ssg-ocp4-ds' in result_path or 'ssg-eks-ds' in result_path) and id_ == "SRC-329":
print(" %s: %s" % (id_, "WARNING (Contains non-standardized yamlfilecontent_test)"))
else:
print(" %s: %s" % (id_, status))
Expand Down