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 1477619..34a1fdb 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,9 @@ /scap-security-guide-0.1.52.tar.bz2 /scap-security-guide-0.1.53.tar.bz2 /scap-security-guide-0.1.54.tar.bz2 +/scap-security-guide-0.1.55.tar.bz2 +/scap-security-guide-0.1.56.tar.bz2 +/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.61.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..1d65cc1 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,22 @@ +--- !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: baseos-ci.brew-build.tier1.functional} + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.ci-beaker.functional} + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation} diff --git a/gating.yml b/gating.yml deleted file mode 100644 index 1f13530..0000000 --- a/gating.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_testing -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_stable -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} 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.spec b/scap-security-guide.spec index de934ef..a6c3a81 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -1,8 +1,13 @@ +# SSG build system and tests count with build directory name `build`. +# For more details see: +# https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds +%global _vpath_builddir build + Name: scap-security-guide -Version: 0.1.54 +Version: 0.1.61 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats -License: BSD-3-Clause +License: BSD URL: https://github.com/ComplianceAsCode/content/ Source0: https://github.com/ComplianceAsCode/content/releases/download/v%{version}/scap-security-guide-%{version}.tar.bz2 BuildArch: noarch @@ -14,6 +19,7 @@ BuildRequires: cmake >= 2.8 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 Obsoletes: openscap-content < 0:0.9.13 Provides: openscap-content @@ -54,6 +60,7 @@ present in %{name} package. %{_datadir}/%{name}/kickstart %{_datadir}/%{name}/ansible %{_datadir}/%{name}/bash +%{_datadir}/%{name}/tailoring %lang(en) %{_mandir}/man8/scap-security-guide.8.* %doc %{_docdir}/%{name}/LICENSE %doc %{_docdir}/%{name}/README.md @@ -64,6 +71,34 @@ present in %{name} package. %doc %{_docdir}/%{name}/tables/*.html %changelog +* Wed May 04 2022 Watson Sato - 0.1.61-1 +- Update to latest upstream SCAP-Security-Guide-0.1.61 release: + https://github.com/ComplianceAsCode/content/releases/tag/v0.1.61 + +* 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 + +* Wed Dec 01 2021 Watson Sato - 0.1.59-1 +- Update to latest upstream SCAP-Security-Guide-0.1.59 release: + https://github.com/ComplianceAsCode/content/releases/tag/v0.1.59 + +* Thu Sep 30 2021 Watson Sato - 0.1.58-1 +- Update to latest upstream SCAP-Security-Guide-0.1.58 release: + https://github.com/ComplianceAsCode/content/releases/tag/v0.1.58 +- Fix license warning. + +* Wed May 26 2021 Vojtech Polasek - 0.1.56-1 +- Update to latest upstream SCAP-Security-Guide-0.1.56 release: + https://github.com/ComplianceAsCode/content/releases/tag/v0.1.56 + +* Wed Apr 07 2021 Vojtech Polasek - 0.1.55-1 +- Update to latest upstream SCAP-Security-Guide-0.1.55 release: + https://github.com/ComplianceAsCode/content/releases/tag/v0.1.55 + +* Fri Feb 12 2021 Vojtech Polasek - 0.1.54-2 +- fix definition of build directory + * Fri Feb 05 2021 Vojtech Polasek - 0.1.54-1 - Update to latest upstream SCAP-Security-Guide-0.1.54 release: https://github.com/ComplianceAsCode/content/releases/tag/v0.1.54 diff --git a/sources b/sources index 7a2c4b2..a61dd0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.54.tar.bz2) = 35d89737c5000c0fcebb36c5ad48958f95edf4563579af2a5591e0f8560fc3de8d90aad39536318ae6ab1261bf2c3e4504533604e94f68d23acc6fc153a37f96 +SHA512 (scap-security-guide-0.1.61.tar.bz2) = 95be5fc1b9734335199db54bff0958ba00f2c5f1873595d8c68b353540988f213d7bdf4139f4e338ac6d45ca9bd27cd97c81956651a5e6e78197ecc7b88e5eff 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"