diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index 10fb6cd..813bef4 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,9 @@ /scap-security-guide-0.1.58.tar.bz2 /scap-security-guide-0.1.59.tar.bz2 /scap-security-guide-0.1.60.tar.bz2 +/scap-security-guide-0.1.62.tar.bz2 +/scap-security-guide-0.1.63.tar.bz2 +/scap-security-guide-0.1.64.tar.bz2 +/scap-security-guide-0.1.65.tar.bz2 +/scap-security-guide-0.1.66.tar.bz2 +/scap-security-guide-0.1.67.tar.bz2 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml index b16b396..1d65cc1 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,17 +1,17 @@ --- !Policy product_versions: - - fedora-* + - fedora-* decision_context: bodhi_update_push_testing subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/fedora_tests.functional} --- !Policy product_versions: - - fedora-* + - fedora-* decision_context: bodhi_update_push_stable subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/fedora_tests.functional} --- !Policy product_versions: - rhel-* diff --git a/plans/fedora_tests.fmf b/plans/fedora_tests.fmf new file mode 100644 index 0000000..63d6437 --- /dev/null +++ b/plans/fedora_tests.fmf @@ -0,0 +1,6 @@ +summary: Run tests from scap-security-guide tests repository +discover: + how: fmf + url: https://src.fedoraproject.org/tests/scap-security-guide +execute: + how: tmt diff --git a/scap-security-guide-0.1.60-fix-jinja-loading-PR_7944.patch b/scap-security-guide-0.1.60-fix-jinja-loading-PR_7944.patch deleted file mode 100644 index 72a07c4..0000000 --- a/scap-security-guide-0.1.60-fix-jinja-loading-PR_7944.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 396fb9029e74b38ea09236c6cd1a7cb38f545afe Mon Sep 17 00:00:00 2001 -From: Gabriel Becker -Date: Wed, 1 Dec 2021 13:20:47 +0100 -Subject: [PATCH] Fix jinja issue on fedora rawhide. - ---- - tests/unit/ssg-module/test_playbook_builder.py | 4 ++-- - utils/duplicated_prodtypes.py | 4 ++-- - utils/fix_file_ocilclause.py | 4 ++-- - utils/move_rules.py | 2 +- - 4 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/tests/unit/ssg-module/test_playbook_builder.py b/tests/unit/ssg-module/test_playbook_builder.py -index 6692c54dfab..38b6f1f52e2 100644 ---- a/tests/unit/ssg-module/test_playbook_builder.py -+++ b/tests/unit/ssg-module/test_playbook_builder.py -@@ -34,9 +34,9 @@ def test_build_rule_playbook(): - assert os.path.exists(real_output_filepath) - - with open(real_output_filepath, "r") as real_output: -- real_output_yaml = yaml.load(real_output) -+ real_output_yaml = yaml.load(real_output, Loader=yaml.Loader) - with open(expected_output_filepath, "r") as expected_output: -- expected_output_yaml = yaml.load(expected_output) -+ expected_output_yaml = yaml.load(expected_output, Loader=yaml.Loader) - - real_play = real_output_yaml.pop() - expected_play = expected_output_yaml.pop() -diff --git a/utils/duplicated_prodtypes.py b/utils/duplicated_prodtypes.py -index 4cb2c16fef8..25c36c58d81 100755 ---- a/utils/duplicated_prodtypes.py -+++ b/utils/duplicated_prodtypes.py -@@ -23,7 +23,7 @@ def _create_profile_cache(ssg_root): - files.sort() - for filename in files: - profile_path = os.path.join(prod_profiles_dir, filename) -- parsed_profile = yaml.load(open(profile_path, 'r')) -+ parsed_profile = yaml.load(open(profile_path, 'r'), Loader=yaml.Loader) - for _obj in parsed_profile['selections']: - obj = _obj - if '=' in obj: -@@ -210,7 +210,7 @@ def find_profiles(ssg_root, path, obj_name): - def parse_from_yaml(file_contents, lines): - new_file_arr = file_contents[lines[0]:lines[1] + 1] - new_file = "\n".join(new_file_arr) -- return yaml.load(new_file) -+ return yaml.load(new_file, Loader=yaml.Loader) - - - def print_file(file_contents): -diff --git a/utils/fix_file_ocilclause.py b/utils/fix_file_ocilclause.py -index 462d2b37c15..d79bb8c51e0 100755 ---- a/utils/fix_file_ocilclause.py -+++ b/utils/fix_file_ocilclause.py -@@ -23,7 +23,7 @@ def _create_profile_cache(ssg_root): - files.sort() - for filename in files: - profile_path = os.path.join(prod_profiles_dir, filename) -- parsed_profile = yaml.load(open(profile_path, 'r')) -+ parsed_profile = yaml.load(open(profile_path, 'r'), Loader=yaml.Loader) - for _obj in parsed_profile['selections']: - obj = _obj - if '=' in obj: -@@ -205,7 +205,7 @@ def fix_ocil_clause(ssg_root, path, obj_name): - def parse_from_yaml(file_contents, lines): - new_file_arr = file_contents[lines[0]:lines[1] + 1] - new_file = "\n".join(new_file_arr) -- return yaml.load(new_file) -+ return yaml.load(new_file, Loader=yaml.Loader) - - - def print_file(file_contents): -diff --git a/utils/move_rules.py b/utils/move_rules.py -index 2deb62b488a..e91a661be85 100755 ---- a/utils/move_rules.py -+++ b/utils/move_rules.py -@@ -340,7 +340,7 @@ def fix_ocil_clause(ssg_root, path, obj_name): - def parse_from_yaml(file_contents, lines): - new_file_arr = file_contents[lines[0]:lines[1] + 1] - new_file = "\n".join(new_file_arr) -- return yaml.load(new_file) -+ return yaml.load(new_file, Loader=yaml.Loader) - - - def print_file(file_contents): diff --git a/scap-security-guide.spec b/scap-security-guide.spec index dcb9a18..8219aeb 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,7 +4,7 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.60 +Version: 0.1.67 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD @@ -21,6 +21,7 @@ BuildRequires: /usr/bin/python3 BuildRequires: python%{python3_pkgversion} BuildRequires: python%{python3_pkgversion}-jinja2 BuildRequires: python%{python3_pkgversion}-PyYAML +BuildRequires: python%{python3_pkgversion}-setuptools Requires: xml-common, openscap-scanner >= 1.2.5 %description @@ -98,6 +99,30 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Wed Apr 12 2023 Matthew Burket - 0.1.67-1 +- Update to latest upstream SCAP-Security-Guide-0.1.67 release: + https://github.com/ComplianceAsCode/content/releases/tag/v0.1.67 + +* Mon Feb 06 2023 Vojtech Polasek - 0.1.66-1 +- Update to latest upstream SCAP-Security-Guide-0.1.66 release: + https://github.com/ComplianceAsCode/content/releases/tag/v0.1.66 + +* Tue Dec 06 2022 Marcus Burghardt - 0.1.65-1 +- Update to latest upstream SCAP-Security-Guide-0.1.65 release: + https://github.com/ComplianceAsCode/content/releases/tag/v0.1.65 + +* Tue Oct 04 2022 Watson Sato - 0.1.64-1 +- Update to latest upstream SCAP-Security-Guide-0.1.64 release: + https://github.com/ComplianceAsCode/content/releases/tag/v0.1.64 + +* Mon Aug 01 2022 Watson Sato - 0.1.63-1 +- Update to latest upstream SCAP-Security-Guide-0.1.63 release: + https://github.com/ComplianceAsCode/content/releases/tag/v0.1.63 + +* Mon May 30 2022 Vojtech Polasek - 0.1.62-1 +- Update to latest upstream SCAP-Security-Guide-0.1.62 release: + https://github.com/ComplianceAsCode/content/releases/tag/v0.1.62 + * Fri Jan 28 2022 Watson Sato - 0.1.60-1 - Update to latest upstream SCAP-Security-Guide-0.1.60 release: https://github.com/ComplianceAsCode/content/releases/tag/v0.1.60 diff --git a/sources b/sources index f97e8d2..412097c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.60.tar.bz2) = 41899c1209b64eb13e76368da141db25fe7e2ab280e67dafc750d470049062f0f16c70ee79f4b3a2131f30c9fb8e23e3c22fb354577239698f2b7f30544d969a +SHA512 (scap-security-guide-0.1.67.tar.bz2) = 31bc39f2ac04409962908ff4c0dacebfff397322f413012029c6c1bc9f7ad1f2b86d81fb22b005df5430f31983cdf4f5c304202be650aed740de868b05c19056 diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 1546340..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,9 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - classic - repositories: - - repo: "https://src.fedoraproject.org/tests/scap-security-guide.git" - dest: "scap-security-guide" - fmf_filter: "tier: 1, 2"