Compare commits
10 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
c4259b4da9 | ||
|
c21bb08006 | ||
|
1f763ec42c | ||
|
4291626786 | ||
|
|
6444a5f3d9 | ||
|
dc31b9b7fe | ||
|
|
0d80879c91 | ||
|
|
6a9f56ef10 | ||
|
|
b3dde6d199 | ||
|
|
ed1967a8de |
7 changed files with 69 additions and 200 deletions
54
.gitignore
vendored
54
.gitignore
vendored
|
|
@ -1,2 +1,52 @@
|
|||
/scap-security-guide-0.1.78.tar.bz2
|
||||
/scap-security-guide-0.1.79.tar.bz2
|
||||
/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.51.tar.bz2
|
||||
/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.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
|
||||
/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
|
||||
|
|
|
|||
|
|
@ -17,4 +17,6 @@ product_versions:
|
|||
- rhel-*
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/tier1.functional}
|
||||
- !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}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
summary: Run all tests in this repository
|
||||
summary: Run tests from scap-security-guide tests repository
|
||||
discover:
|
||||
how: fmf
|
||||
url: https://src.fedoraproject.org/tests/scap-security-guide
|
||||
execute:
|
||||
how: tmt
|
||||
|
|
|
|||
|
|
@ -4,21 +4,24 @@
|
|||
%global _vpath_builddir build
|
||||
|
||||
Name: scap-security-guide
|
||||
Version: 0.1.79
|
||||
Version: 0.1.67
|
||||
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
|
||||
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: expat
|
||||
BuildRequires: openscap-scanner >= 1.2.5
|
||||
BuildRequires: cmake >= 2.8
|
||||
# To get python3 inside the buildroot require its path explicitly in BuildRequires
|
||||
BuildRequires: /usr/bin/python3
|
||||
BuildRequires: python%{python3_pkgversion}
|
||||
BuildRequires: python%{python3_pkgversion}-jinja2
|
||||
BuildRequires: python%{python3_pkgversion}-PyYAML
|
||||
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||
Requires: xml-common, openscap-scanner >= 1.2.5
|
||||
|
||||
%description
|
||||
|
|
@ -42,7 +45,7 @@ The %{name}-doc package contains HTML formatted documents containing
|
|||
hardening guidances that have been generated from XCCDF benchmarks
|
||||
present in %{name} package.
|
||||
|
||||
%if ( %{defined rhel} && (! %{defined centos}) && (! %{defined eln}) )
|
||||
%if ( %{defined rhel} && (! %{defined centos}) )
|
||||
%package rule-playbooks
|
||||
Summary: Ansible playbooks per each rule.
|
||||
Group: System Environment/Base
|
||||
|
|
@ -57,7 +60,7 @@ The %{name}-rule-playbooks package contains individual ansible playbooks per rul
|
|||
|
||||
%define cmake_defines_common -DSSG_SEPARATE_SCAP_FILES_ENABLED=OFF -DSSG_BASH_SCRIPTS_ENABLED=OFF -DSSG_BUILD_SCAP_12_DS=OFF
|
||||
%define cmake_defines_specific %{nil}
|
||||
%if 0%{?rhel} && ! %{defined eln}
|
||||
%if 0%{?rhel}
|
||||
%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{rhel}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON
|
||||
%endif
|
||||
%if 0%{?centos}
|
||||
|
|
@ -81,7 +84,7 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md
|
|||
%{_datadir}/%{name}/tailoring
|
||||
%lang(en) %{_mandir}/man8/scap-security-guide.8.*
|
||||
%doc %{_docdir}/%{name}/LICENSE
|
||||
%if ( %{defined rhel} && (! %{defined centos}) && (! %{defined eln}) )
|
||||
%if ( %{defined rhel} && (! %{defined centos}) )
|
||||
%exclude %{_datadir}/%{name}/ansible/rule_playbooks
|
||||
%endif
|
||||
|
||||
|
|
@ -89,91 +92,21 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md
|
|||
%doc %{_docdir}/%{name}/guides/*.html
|
||||
%doc %{_docdir}/%{name}/tables/*.html
|
||||
|
||||
%if ( %{defined rhel} && (! %{defined centos}) && (! %{defined eln}) )
|
||||
%if ( %{defined rhel} && (! %{defined centos}) )
|
||||
%files rule-playbooks
|
||||
%defattr(-,root,root,-)
|
||||
%{_datadir}/%{name}/ansible/rule_playbooks
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Nov 28 2025 Jan Černý <jcerny@redhat.com> - 0.1.79-1
|
||||
- Upgrade to the latest upstream release
|
||||
|
||||
* Mon Sep 08 2025 Matthew Burket <mburket@redhat.com> - 0.1.78-1
|
||||
- Update to latest upstream release:
|
||||
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.78
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.77-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Mon Jun 02 2025 Matthew Burket <mburket@redhat.com> - 0.1.77-1
|
||||
- Update to latest upstream release:
|
||||
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.77
|
||||
|
||||
* Fri Mar 07 2025 Matthew Burket <mburket@redhat.com> - 0.1.76-2
|
||||
- Remove expat as a BuildRequires as it is no longer needed
|
||||
|
||||
* Tue Feb 25 2025 Evgenii Kolesnikov <ekolesni@redhat.com> - 0.1.76-1
|
||||
- Update to latest upstream release:
|
||||
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.76
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.75-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Thu Nov 14 2024 Matthew Burket <mburket@redhat.com> - 0.1.75-1
|
||||
- Update to latest upstream release
|
||||
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.75
|
||||
|
||||
* Mon Aug 12 2024 Matthew Burket <mburket@redhat.com> - 0.1.74-1
|
||||
- Update to latest upstream release:
|
||||
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.74
|
||||
- Remove /usr/bin/python3 from BuildRequires
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.73-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Wed May 22 2024 Jan Černý <jcerny@redhat.com> - 0.1.73-1
|
||||
- Update to latest upstream release
|
||||
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.73
|
||||
|
||||
* Fri Feb 09 2024 Vojtech Polasek <vpolasek@redhat.com> - 0.1.72-1
|
||||
- Update to latest upstream SCAP-Security-Guide-0.1.72 release:
|
||||
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.72
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.71-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Tue Dec 19 2023 Vojtech Polasek <vpolasek@redhat.com> - 0.1.71-1
|
||||
- Update to latest upstream SCAP-Security-Guide-0.1.71 release:
|
||||
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.71
|
||||
|
||||
* Thu Oct 12 2023 Matthew Burket <mburket@redhat.com> - 0.1.70-1
|
||||
- Update to latest upstream SCAP-Security-Guide-0.1.70 release:
|
||||
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.70
|
||||
|
||||
* Thu Aug 03 2023 Jan Černý <jcerny@redhat.com> - 0.1.69-1
|
||||
- Update to latest upstream SCAP-Security-Guide-0.1.69 release:
|
||||
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.69
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.68-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Jun 15 2023 Jan Černý <jcerny@redhat.com> - 0.1.68-1
|
||||
- Update to latest upstream SCAP-Security-Guide-0.1.68 release:
|
||||
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.68
|
||||
|
||||
* Wed Apr 12 2023 Matthew Burket <mburket@redhat.com> - 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
|
||||
|
||||
|
||||
* Fri Feb 03 2023 Vojtech Polasek <vpolasek@redhat.com> - 0.1.66-1
|
||||
* Mon Feb 06 2023 Vojtech Polasek <vpolasek@redhat.com> - 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
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.65-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Tue Dec 06 2022 Marcus Burghardt <maburgha@redhat.com> - 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
|
||||
|
|
@ -186,20 +119,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md
|
|||
- Update to latest upstream SCAP-Security-Guide-0.1.63 release:
|
||||
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.63
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.62-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Thu Jun 09 2022 Vojtech Polasek <vpolasek@redhat.com> - 0.1.62-2
|
||||
- rebuild, the release did not get propagated into rawhide
|
||||
|
||||
* Mon May 30 2022 Vojtech Polasek <vpolasek@redhat.com> - 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 <wsato@redhat.com> - 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 <wsato@redhat.com> - 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
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (scap-security-guide-0.1.79.tar.bz2) = 57963e896aef6089523bb7165ece32dafeedc2caf0baac594c4d0d083ff00bd37c4fdc1c98357db1c70523bb67543c07b6a41b7d989ba1a8e97907218d954311
|
||||
SHA512 (scap-security-guide-0.1.67.tar.bz2) = 31bc39f2ac04409962908ff4c0dacebfff397322f413012029c6c1bc9f7ad1f2b86d81fb22b005df5430f31983cdf4f5c304202be650aed740de868b05c19056
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
summary: Test calls upstream test suite.
|
||||
description: |
|
||||
Runs upstream test suite against content built from the source RPM - testing
|
||||
the content from the installed scap-security-guide is not feasible as the
|
||||
upstream test suite is hardcoded to test the content from the CMAKE_BINARY_DIR
|
||||
directory with hardcoded paths which are not the same as paths where content is
|
||||
installed from the scap-security-guide RPM. Test suite is also built from the
|
||||
scap-security-guide source RPM by running %prep and %build stages from the spec
|
||||
file.
|
||||
contact: Matus Marhefka <mmarhefk@redhat.com>
|
||||
test: ./runtest.sh
|
||||
framework: beakerlib
|
||||
require:
|
||||
- library(ControlFlow/Cleanup)
|
||||
- library(rpm/snapshot)
|
||||
- scap-security-guide
|
||||
recommend:
|
||||
- yum-utils
|
||||
- rpm-build
|
||||
- dnf-plugins-core
|
||||
- gcc
|
||||
- python3-pytest
|
||||
- python3-pip
|
||||
- python3-devel
|
||||
- ansible
|
||||
duration: 90m
|
||||
enabled: true
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
#!/bin/bash
|
||||
# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# runtest.sh of /CoreOS/scap-security-guide/Sanity/smoke-test
|
||||
# Description: Test calls upstream test suite.
|
||||
# Author: Marek Haicman <mhaicman@redhat.com>
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Copyright (c) 2018 Red Hat, Inc. All rights reserved.
|
||||
#
|
||||
# This copyrighted material is made available to anyone wishing
|
||||
# to use, modify, copy, or redistribute it subject to the terms
|
||||
# and conditions of the GNU General Public License version 2.
|
||||
#
|
||||
# This program is distributed in the hope that it will be
|
||||
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
# PURPOSE. See the GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public
|
||||
# License along with this program; if not, write to the Free
|
||||
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
# Boston, MA 02110-1301, USA.
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||
|
||||
PACKAGE="scap-security-guide"
|
||||
|
||||
rlJournalStart
|
||||
|
||||
rlPhaseStartSetup
|
||||
rlImport ControlFlow/Cleanup rpm/snapshot || rlDie "Failed to import libraries"
|
||||
rlAssertRpm "$PACKAGE"
|
||||
|
||||
RpmSnapshotCreate
|
||||
CleanupRegister "RpmSnapshotRevert"
|
||||
rlRun "TmpDir=\$(mktemp -d)" 0
|
||||
CleanupRegister "rlRun 'rm -r $TmpDir' 0 'Removing tmp directory'"
|
||||
rlRun "pushd $TmpDir"
|
||||
CleanupRegister "rlRun 'popd'"
|
||||
|
||||
rlFetchSrcForInstalled $PACKAGE
|
||||
rlRun "dnf builddep -y $PACKAGE*"
|
||||
SITE_PACKAGES=$(python3 -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')
|
||||
rlRun "pip3 install --target=$SITE_PACKAGES ruamel.yaml yamlpath prometheus-client"
|
||||
CleanupRegister "rlRun 'pip3 uninstall -y ruamel.yaml yamlpath prometheus-client'"
|
||||
TOPDIR=`rpm --eval %_topdir`
|
||||
rlRun "rm -rf ${TOPDIR}/BUILD/${PACKAGE}*" 0-255
|
||||
rlRun "rpm -ihv `ls *.rpm`" 0 "Install $PACKAGE source RPM"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartSetup "Prepare upstream test suite (%prep and %build stages from the spec file)"
|
||||
rlRun "rpmbuild -v -bc ${TOPDIR}/SPECS/${PACKAGE}.spec"
|
||||
CleanupRegister "rlRun 'rm -rf ${TOPDIR}/BUILD/${PACKAGE}*'"
|
||||
CleanupRegister "rlRun 'rm -rf ${TOPDIR}/SPECS/${PACKAGE}*'"
|
||||
CleanupRegister "rlRun 'rm -rf ${TOPDIR}/SOURCES/*'"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "Run upstream test suite"
|
||||
BUILD_DIR_PATH="$(find $TOPDIR -name build | grep scap-security-guide)"
|
||||
rlRun -s "cmake --build $BUILD_DIR_PATH --target test -- ARGS='--output-on-failure'"
|
||||
rv=$?
|
||||
|
||||
# if we got error, submit file with result of particular test for easier debugging
|
||||
if [ $rv -ne 0 ]; then
|
||||
FILE="${BUILD_DIR_PATH}/Testing/Temporary/LastTest.log"
|
||||
rlBundleLogs test_outputs $(readlink -f $FILE)
|
||||
fi
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartCleanup
|
||||
CleanupDo
|
||||
rlPhaseEnd
|
||||
|
||||
rlJournalPrintText
|
||||
rlJournalEnd
|
||||
Loading…
Add table
Add a link
Reference in a new issue