From 1da0b715bcc2201a206b3a46e89862d998fb1d9f Mon Sep 17 00:00:00 2001 From: George Pantelakis Date: Thu, 6 Mar 2025 18:09:09 +0100 Subject: [PATCH] Migrate gating to fmf format --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 7 ++++--- plans/ci.fmf | 23 +++++++++++++++++++++++ tests/runtest.sh | 15 --------------- tests/tests.yml | 13 ------------- 6 files changed, 29 insertions(+), 31 deletions(-) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 plans/ci.fmf delete mode 100755 tests/runtest.sh 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/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 cf01301..09aaf90 100644 --- a/gating.yaml +++ b/gating.yaml @@ -4,6 +4,7 @@ product_versions: - rhel-8 decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.opensc.functional } - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.smart-cards.functional } + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-buildroot-disabled.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-buildroot-enabled.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-enabled-buildroot-disabled.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-enabled-buildroot-enabled.functional} diff --git a/plans/ci.fmf b/plans/ci.fmf new file mode 100644 index 0000000..b7d0f76 --- /dev/null +++ b/plans/ci.fmf @@ -0,0 +1,23 @@ +/fips-disabled-buildroot-disabled: + plan: + import: + url: https://pkgs.devel.redhat.com/git/tests/opensc + name: /plans/ci/fips-disabled-buildroot-disabled + +/fips-disabled-buildroot-enabled: + plan: + import: + url: https://pkgs.devel.redhat.com/git/tests/opensc + name: /plans/ci/fips-disabled-buildroot-enabled + +/fips-enabled-buildroot-disabled: + plan: + import: + url: https://pkgs.devel.redhat.com/git/tests/opensc + name: /plans/ci/fips-enabled-buildroot-disabled + +/fips-enabled-buildroot-enabled: + plan: + import: + url: https://pkgs.devel.redhat.com/git/tests/opensc + name: /plans/ci/fips-enabled-buildroot-enabled diff --git a/tests/runtest.sh b/tests/runtest.sh deleted file mode 100755 index d4747ef..0000000 --- a/tests/runtest.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -x - -export GIT_SSL_NO_VERIFY=true -git clone https://gitlab.cee.redhat.com/idm/smartcards.git -cd smartcards/gating/opensc -./setup_opensc_gating.sh - -pytest-3 -v --junit-xml=/tmp/artifacts/junit.xml \ - --log-cli-level=INFO \ - --log-cli-format="[%(name)s] %(levelname)s %(message)s" \ - --log-file=/tmp/artifacts/pytest-run.log \ - --log-file-level=DEBUG \ - --log-file-format="%(asctime)s [%(name)s] %(levelname)s %(message)s" \ - --log-file-date-format="%Y-%m-%dT%H:%M:%S%z" \ - test_opensc_sanity.py diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index b7f7a59..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,13 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - tests: - - opensc: - dir: . - run: ./runtest.sh - required_packages: - - git - - python3-pytest - - python3-pexpect