From 15557ae7cb9bf8f51f8f6bc0bfc82a2b95bc6e9a Mon Sep 17 00:00:00 2001 From: Milan Lysonek Date: Wed, 7 Aug 2024 12:20:15 +0200 Subject: [PATCH] Switch gating to tmt Resolves: RHEL-43240 --- ci.fmf | 1 + gating.yaml | 5 ++--- openscap.spec | 5 ++++- plans/ci.fmf | 12 ++++++++++++ 4 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 ci.fmf create mode 100644 plans/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 diff --git a/gating.yaml b/gating.yaml index d88a5bf..79022d2 100644 --- a/gating.yaml +++ b/gating.yaml @@ -3,6 +3,5 @@ product_versions: - rhel-8 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} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/default-hw-tier1.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/custom-hw-tier1.functional} diff --git a/openscap.spec b/openscap.spec index 7abcc56..d37e80c 100644 --- a/openscap.spec +++ b/openscap.spec @@ -1,6 +1,6 @@ Name: openscap Version: 1.3.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Set of open source libraries enabling integration of the SCAP line of standards Group: System Environment/Libraries License: LGPLv2+ @@ -216,6 +216,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/oscap-run-sce-script %changelog +* Wed Aug 07 2024 Milan Lysonek - 1.3.10-3 +- Switch gating to tmt plan (RHEL-43240) + * Mon Apr 08 2024 Jan Černý - 1.3.10-2 - Explicitely disable dpkginfo probe diff --git a/plans/ci.fmf b/plans/ci.fmf new file mode 100644 index 0000000..4be8533 --- /dev/null +++ b/plans/ci.fmf @@ -0,0 +1,12 @@ +summary: CI test plan +/default-hw-tier1: + plan: + import: + url: https://pkgs.devel.redhat.com/git/tests/openscap + name: /plans/gating/default-hw-tier1 + +/custom-hw-tier1: + plan: + import: + url: https://pkgs.devel.redhat.com/git/tests/openscap + name: /plans/gating/custom-hw-tier1