From 63765dd8bb854ebada2e5f8e5f5bcf081fd67553 Mon Sep 17 00:00:00 2001 From: Matus Marhefka Date: Thu, 11 Feb 2021 14:01:05 +0100 Subject: [PATCH 01/12] Define _vpath_builddir macro as `build` 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 --- scap-security-guide.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index de934ef..54344cb 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -1,3 +1,8 @@ +# 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 Release: 1%{?dist} From 21f968f5122fa835fd6f720c7086eb99a350453c Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Fri, 12 Feb 2021 10:35:24 +0100 Subject: [PATCH 02/12] fix build directory --- scap-security-guide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 54344cb..f83580c 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -5,7 +5,7 @@ Name: scap-security-guide Version: 0.1.54 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause URL: https://github.com/ComplianceAsCode/content/ @@ -69,6 +69,9 @@ present in %{name} package. %doc %{_docdir}/%{name}/tables/*.html %changelog +* 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 From d4fc812342902bf9ce46d33aaeb9e4c337e53943 Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Wed, 7 Apr 2021 11:58:42 +0200 Subject: [PATCH 03/12] scap-security-guide 0.1.55 --- .gitignore | 1 + scap-security-guide.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1477619..d00d110 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /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 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index f83580c..c79d079 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,8 +4,8 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.54 -Release: 2%{?dist} +Version: 0.1.55 +Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause URL: https://github.com/ComplianceAsCode/content/ @@ -69,6 +69,10 @@ present in %{name} package. %doc %{_docdir}/%{name}/tables/*.html %changelog +* 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 diff --git a/sources b/sources index 7a2c4b2..02259d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.54.tar.bz2) = 35d89737c5000c0fcebb36c5ad48958f95edf4563579af2a5591e0f8560fc3de8d90aad39536318ae6ab1261bf2c3e4504533604e94f68d23acc6fc153a37f96 +SHA512 (scap-security-guide-0.1.55.tar.bz2) = 3e1e3c16dac2b4ea07f164f488c2e7d0690efd64a185c9c1fb0cfe4875a4076cb207144c9232c33f9f08cc999f5284f1a221065100d699dc84168e86631912f8 From ebc27efe3eec150949d08e9323c0d4f35c1991fb Mon Sep 17 00:00:00 2001 From: Matus Marhefka Date: Thu, 13 May 2021 17:24:10 +0200 Subject: [PATCH 04/12] Fix gating.yaml name See: https://docs.fedoraproject.org/en-US/ci/gating/#_enable --- gating.yml => gating.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename gating.yml => gating.yaml (100%) diff --git a/gating.yml b/gating.yaml similarity index 100% rename from gating.yml rename to gating.yaml From 3e0bf4f6e6ab8740862620e704cfe95fa542b96d Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Wed, 26 May 2021 17:03:19 +0200 Subject: [PATCH 05/12] scap-security-guide 0.1.56 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d00d110..300dd31 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /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 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index c79d079..1b1f13a 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.55 +Version: 0.1.56 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause @@ -69,6 +69,10 @@ present in %{name} package. %doc %{_docdir}/%{name}/tables/*.html %changelog +* 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 diff --git a/sources b/sources index 02259d0..cad4a93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.55.tar.bz2) = 3e1e3c16dac2b4ea07f164f488c2e7d0690efd64a185c9c1fb0cfe4875a4076cb207144c9232c33f9f08cc999f5284f1a221065100d699dc84168e86631912f8 +SHA512 (scap-security-guide-0.1.56.tar.bz2) = 1c876f1a8e03f3f68de8fd5a8fd020567f0eecb1fb8b9c9f754453c2f22278944f50d06c0f4e771020e2e25facf6cecb1044d3ddb12e531428ca5aacfec3c86c From 9bf956787654e2dc183f1af1e974b8b6579b75bb Mon Sep 17 00:00:00 2001 From: Watson Sato Date: Thu, 30 Sep 2021 14:07:25 +0200 Subject: [PATCH 06/12] Rebase to release 0.1.58 --- .gitignore | 1 + scap-security-guide.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 300dd31..377e8ba 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /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 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 1b1f13a..8b3b52c 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,10 +4,10 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.56 +Version: 0.1.58 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 @@ -69,6 +69,11 @@ present in %{name} package. %doc %{_docdir}/%{name}/tables/*.html %changelog +* 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 diff --git a/sources b/sources index cad4a93..c3573e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.56.tar.bz2) = 1c876f1a8e03f3f68de8fd5a8fd020567f0eecb1fb8b9c9f754453c2f22278944f50d06c0f4e771020e2e25facf6cecb1044d3ddb12e531428ca5aacfec3c86c +SHA512 (scap-security-guide-0.1.58.tar.bz2) = 656d959d9e92f1b857afdd25fdb3eb2918630a0ffe34b90ffe3939124410c6d0e655d71b10c99f6ff35090a086ac7bd57acdc1d55822e472f09f160704f1a7d7 From ea7124c25e65cf81e4d1176c7574de4f2ab43587 Mon Sep 17 00:00:00 2001 From: Watson Sato Date: Wed, 1 Dec 2021 17:46:24 +0100 Subject: [PATCH 07/12] Rebase to release 0.1.59 --- .gitignore | 1 + scap-security-guide.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 377e8ba..d318e12 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /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 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 8b3b52c..73c5f68 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.58 +Version: 0.1.59 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD @@ -59,6 +59,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 @@ -69,6 +70,10 @@ present in %{name} package. %doc %{_docdir}/%{name}/tables/*.html %changelog +* 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 diff --git a/sources b/sources index c3573e8..8cdca32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.58.tar.bz2) = 656d959d9e92f1b857afdd25fdb3eb2918630a0ffe34b90ffe3939124410c6d0e655d71b10c99f6ff35090a086ac7bd57acdc1d55822e472f09f160704f1a7d7 +SHA512 (scap-security-guide-0.1.59.tar.bz2) = 2a92e6835749137c1080f08d2120949dbfea01eedf5f29728beb84dae62f90fd81b8869337cffa738de90641e0f5efc58115d914dceb691b12b805af2ad2de04 From 32d3f3a7eaebfef607b89e1e4ccbb2abaa452db5 Mon Sep 17 00:00:00 2001 From: Watson Sato Date: Fri, 28 Jan 2022 11:44:16 +0100 Subject: [PATCH 08/12] Rebase to release 0.1.60 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d318e12..b297ccc 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /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 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 73c5f68..c50eaf0 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.59 +Version: 0.1.60 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD @@ -70,6 +70,10 @@ present in %{name} package. %doc %{_docdir}/%{name}/tables/*.html %changelog +* 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 diff --git a/sources b/sources index 8cdca32..f97e8d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.59.tar.bz2) = 2a92e6835749137c1080f08d2120949dbfea01eedf5f29728beb84dae62f90fd81b8869337cffa738de90641e0f5efc58115d914dceb691b12b805af2ad2de04 +SHA512 (scap-security-guide-0.1.60.tar.bz2) = 41899c1209b64eb13e76368da141db25fe7e2ab280e67dafc750d470049062f0f16c70ee79f4b3a2131f30c9fb8e23e3c22fb354577239698f2b7f30544d969a From ccba6a391c830fcae2d47891942d01073cf871bb Mon Sep 17 00:00:00 2001 From: Watson Sato Date: Wed, 4 May 2022 22:36:40 +0200 Subject: [PATCH 09/12] Rebase to 0.1.61 --- .gitignore | 1 + scap-security-guide.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b297ccc..34a1fdb 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /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/scap-security-guide.spec b/scap-security-guide.spec index c50eaf0..a6c3a81 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.61 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD @@ -19,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 @@ -70,6 +71,10 @@ 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 diff --git a/sources b/sources index f97e8d2..a61dd0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.60.tar.bz2) = 41899c1209b64eb13e76368da141db25fe7e2ab280e67dafc750d470049062f0f16c70ee79f4b3a2131f30c9fb8e23e3c22fb354577239698f2b7f30544d969a +SHA512 (scap-security-guide-0.1.61.tar.bz2) = 95be5fc1b9734335199db54bff0958ba00f2c5f1873595d8c68b353540988f213d7bdf4139f4e338ac6d45ca9bd27cd97c81956651a5e6e78197ecc7b88e5eff From 3cfe62d42de81813e04736e28a986afe6d1b4547 Mon Sep 17 00:00:00 2001 From: Matus Marhefka Date: Mon, 11 Apr 2022 17:38:09 +0200 Subject: [PATCH 10/12] Fedora CI: replace STI with tmt --- .fmf/version | 1 + gating.yaml | 16 ++++++++++++---- plans/main.fmf | 6 ++++++ tests/tests.yml | 9 --------- 4 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/main.fmf delete mode 100644 tests/tests.yml 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/gating.yaml b/gating.yaml index 1f13530..4b3cff0 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,14 +1,22 @@ --- !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/main.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/main.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/plans/main.fmf b/plans/main.fmf new file mode 100644 index 0000000..63d6437 --- /dev/null +++ b/plans/main.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/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" From da6d8c90b09ef11e1db0f4ade120736bdaf6b90a Mon Sep 17 00:00:00 2001 From: Matus Marhefka Date: Tue, 31 May 2022 10:13:10 +0200 Subject: [PATCH 11/12] Add ci.fmf file which is needed for proper CI results reporting --- ci.fmf | 1 + 1 file changed, 1 insertion(+) create mode 100644 ci.fmf 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 From b09d34fb9fa4b7349d2b679bdda962b46f27d621 Mon Sep 17 00:00:00 2001 From: Matus Marhefka Date: Wed, 1 Jun 2022 17:22:45 +0200 Subject: [PATCH 12/12] main is reserved keyword by tmt and cannot be used as a plan name --- gating.yaml | 4 ++-- plans/{main.fmf => fedora_tests.fmf} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename plans/{main.fmf => fedora_tests.fmf} (100%) diff --git a/gating.yaml b/gating.yaml index 4b3cff0..1d65cc1 100644 --- a/gating.yaml +++ b/gating.yaml @@ -4,14 +4,14 @@ product_versions: decision_context: bodhi_update_push_testing subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/main.functional} + - !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/main.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/fedora_tests.functional} --- !Policy product_versions: - rhel-* diff --git a/plans/main.fmf b/plans/fedora_tests.fmf similarity index 100% rename from plans/main.fmf rename to plans/fedora_tests.fmf