From 859c4c45b26b0ce4b4a1dbd11ea1d23fe9197a0c Mon Sep 17 00:00:00 2001 From: Watson Sato Date: Fri, 28 Jan 2022 11:44:16 +0100 Subject: [PATCH 1/9] Rebase to release 0.1.60 --- .gitignore | 1 + scap-security-guide.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 18ed2f7..10fb6cd 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /scap-security-guide-0.1.57.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 38f0412..ec9ea33 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 @@ -12,8 +12,6 @@ URL: https://github.com/ComplianceAsCode/content/ Source0: https://github.com/ComplianceAsCode/content/releases/download/v%{version}/scap-security-guide-%{version}.tar.bz2 BuildArch: noarch -Patch0: scap-security-guide-0.1.60-fix-jinja-loading-PR_7944.patch - BuildRequires: libxslt BuildRequires: expat BuildRequires: openscap-scanner >= 1.2.5 @@ -100,6 +98,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %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 e9e5c79afc125853597b58ef8dc4eb13875c4873 Mon Sep 17 00:00:00 2001 From: Watson Sato Date: Wed, 4 May 2022 22:36:40 +0200 Subject: [PATCH 2/9] 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 10fb6cd..dd34057 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,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 ec9ea33..1e69703 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 @@ -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,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %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 d14082a72ed8b077c06ba71c73f6efb299a10e69 Mon Sep 17 00:00:00 2001 From: Matus Marhefka Date: Mon, 11 Apr 2022 17:38:09 +0200 Subject: [PATCH 3/9] Fedora CI: replace STI with tmt --- .fmf/version | 1 + gating.yaml | 8 ++++---- plans/main.fmf | 6 ++++++ tests/tests.yml | 9 --------- 4 files changed, 11 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 b16b396..4b3cff0 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/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-* 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 3a9c3296f0e49da5b0dbc320befdf91871996d5d Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Mon, 30 May 2022 14:23:05 +0200 Subject: [PATCH 4/9] rebase to 0.1.62 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dd34057..9d43ed2 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /scap-security-guide-0.1.59.tar.bz2 /scap-security-guide-0.1.60.tar.bz2 /scap-security-guide-0.1.61.tar.bz2 +/scap-security-guide-0.1.62.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 1e69703..9aded39 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.61 +Version: 0.1.62 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* 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 + * 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 diff --git a/sources b/sources index a61dd0d..7ce9265 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.61.tar.bz2) = 95be5fc1b9734335199db54bff0958ba00f2c5f1873595d8c68b353540988f213d7bdf4139f4e338ac6d45ca9bd27cd97c81956651a5e6e78197ecc7b88e5eff +SHA512 (scap-security-guide-0.1.62.tar.bz2) = b8cdd76ad0c09c9257121283df6e5a8f2acd6c9734ff9b577673ce8ff04af8a1b9ceb37621cb8bd0873391f771844e0479954850ae77b442c780206b957a0e09 From 4637689a50018f32b7e13f68ab68c88da0992408 Mon Sep 17 00:00:00 2001 From: Matus Marhefka Date: Tue, 31 May 2022 10:13:10 +0200 Subject: [PATCH 5/9] 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 f803d429de90518fc0d60f54daf399cc63f3cdbb Mon Sep 17 00:00:00 2001 From: Matus Marhefka Date: Wed, 1 Jun 2022 17:22:45 +0200 Subject: [PATCH 6/9] 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 From 5b17bd1ba2aeaf12e25d9a5b5332ad38f2db4d5d Mon Sep 17 00:00:00 2001 From: Watson Sato Date: Mon, 1 Aug 2022 15:07:33 +0200 Subject: [PATCH 7/9] Rebase to 0.1.63 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9d43ed2..6268d6c 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /scap-security-guide-0.1.60.tar.bz2 /scap-security-guide-0.1.61.tar.bz2 /scap-security-guide-0.1.62.tar.bz2 +/scap-security-guide-0.1.63.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 9aded39..4ddeb1b 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.62 +Version: 0.1.63 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* 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 diff --git a/sources b/sources index 7ce9265..553cad7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.62.tar.bz2) = b8cdd76ad0c09c9257121283df6e5a8f2acd6c9734ff9b577673ce8ff04af8a1b9ceb37621cb8bd0873391f771844e0479954850ae77b442c780206b957a0e09 +SHA512 (scap-security-guide-0.1.63.tar.bz2) = ad2f7f873af22b0bc2916d8487f6d5621c65495c4c84a0a4e8c98969d5edd2a0833e956b32c19c893e1852b15adc65af24bb4fea7db71b3042c5e1b512a3957b From b6c31907eb60918854e723df5cdbf9f366a40279 Mon Sep 17 00:00:00 2001 From: Watson Sato Date: Tue, 4 Oct 2022 15:17:11 +0200 Subject: [PATCH 8/9] Rebase to 0.1.64 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6268d6c..ea6ab63 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ /scap-security-guide-0.1.61.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 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 4ddeb1b..cadea70 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.63 +Version: 0.1.64 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* 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 diff --git a/sources b/sources index 553cad7..c7ad9b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.63.tar.bz2) = ad2f7f873af22b0bc2916d8487f6d5621c65495c4c84a0a4e8c98969d5edd2a0833e956b32c19c893e1852b15adc65af24bb4fea7db71b3042c5e1b512a3957b +SHA512 (scap-security-guide-0.1.64.tar.bz2) = fc295bafdac8a3fafbcd1bff50b7043a11de23e1a363883a7fac11d3734e9d381dad2e180cc14c259e34fa4eea8b0c27720a8df455d509be3c97913f51294850 From 886f24c86ede4f6c89351829f9ec8ae17baea36a Mon Sep 17 00:00:00 2001 From: Marcus Burghardt Date: Tue, 6 Dec 2022 16:07:34 +0100 Subject: [PATCH 9/9] Rebase to 0.1.65 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ea6ab63..2c5004b 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /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 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index cadea70..382f415 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.64 +Version: 0.1.65 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* 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 diff --git a/sources b/sources index c7ad9b3..ece9ecf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.64.tar.bz2) = fc295bafdac8a3fafbcd1bff50b7043a11de23e1a363883a7fac11d3734e9d381dad2e180cc14c259e34fa4eea8b0c27720a8df455d509be3c97913f51294850 +SHA512 (scap-security-guide-0.1.65.tar.bz2) = 8c0f7431da33d80878d37cecff6afd55cfc3cc4085e987a5b0d5cecc8969373afa24c409d25bbe6de5ce1b6a718ed0d8c685a029ec7fec0c0de7d66f5040ad16