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 fc8bfd6..c74915f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,36 +1,2 @@ -/scap-security-guide-0.1-3.tar.gz -/scap-security-guide-0.1.4.tar.gz -/scap-security-guide-0.1-16.tar.gz -/scap-security-guide-0.1.5.tar.gz -/scap-security-guide-0.1.18.tar.gz -/scap-security-guide-0.1.19.tar.gz -/scap-security-guide-0.1.21.tar.gz -/v0.1.22.tar.gz -/v0.1.23.tar.gz -/v0.1.24.tar.gz -/v0.1.25.tar.gz -/v0.1.26.tar.gz -/v0.1.27.tar.gz -/v0.1.28.tar.gz -/scap-security-guide-0.1.29.tar.gz -/0.1.29.tar.gz -/v0.1.29.tar.gz -/v0.1.30.tar.gz -/scap-security-guide-0.1.31.tar.gz -/scap-security-guide-0.1.32.tar.gz -/scap-security-guide-0.1.33.tar.bz2 -/scap-security-guide-0.1.34.tar.bz2 -/scap-security-guide-0.1.35.tar.bz2 -/scap-security-guide-0.1.36.tar.bz2 -/scap-security-guide-0.1.37.tar.bz2 -/scap-security-guide-0.1.38.tar.bz2 -/scap-security-guide-0.1.39.tar.bz2 -/scap-security-guide-0.1.40.tar.bz2 -/scap-security-guide-0.1.41.tar.bz2 -/scap-security-guide-0.1.42.tar.bz2 -/scap-security-guide-0.1.43.tar.bz2 -/scap-security-guide-0.1.44.tar.bz2 -/scap-security-guide-0.1.45.tar.bz2 -/scap-security-guide-0.1.47.tar.bz2 -/scap-security-guide-0.1.48.tar.bz2 -/scap-security-guide-0.1.49.tar.bz2 +/scap-security-guide-0.1.78.tar.bz2 +/scap-security-guide-0.1.79.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 new file mode 100644 index 0000000..46eab8d --- /dev/null +++ b/gating.yaml @@ -0,0 +1,20 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_testing +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/fedora_tests.functional} +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/fedora_tests.functional} +--- !Policy +product_versions: + - rhel-* +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/tier1.functional} diff --git a/plans/fedora_tests.fmf b/plans/fedora_tests.fmf new file mode 100644 index 0000000..3f21692 --- /dev/null +++ b/plans/fedora_tests.fmf @@ -0,0 +1,5 @@ +summary: Run all tests in this repository +discover: + how: fmf +execute: + how: tmt diff --git a/scap-security-guide-0.1.48-xml_parsing.patch b/scap-security-guide-0.1.48-xml_parsing.patch deleted file mode 100644 index 570d5ff..0000000 --- a/scap-security-guide-0.1.48-xml_parsing.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 174293162e5840684d967e36840fc1f9f57c90be Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= -Date: Thu, 5 Dec 2019 15:02:05 +0100 -Subject: [PATCH] Fix XML "parsing" of the remediation functions file. - -A proper fix is not worth the effort, as we aim to kill shared Bash remediation -with Jinja2 macros. ---- - ssg/build_remediations.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/ssg/build_remediations.py b/ssg/build_remediations.py -index 7da807bd68..13e90f7327 100644 ---- a/ssg/build_remediations.py -+++ b/ssg/build_remediations.py -@@ -56,11 +56,11 @@ def get_available_functions(build_dir): - remediation_functions = [] - with codecs.open(xmlfilepath, "r", encoding="utf-8") as xmlfile: - filestring = xmlfile.read() -- # This regex looks implementation dependent but we can rely on -- # ElementTree sorting XML attrs alphabetically. Hidden is guaranteed -- # to be the first attr and ID is guaranteed to be second. -+ # This regex looks implementation dependent but we can rely on the element attributes -+ # being present on one line. -+ # We can't rely on ElementTree sorting XML attrs in any way since Python 3.7. - remediation_functions = re.findall( -- r'