From 8311ab802672a4384645ab5d4e78767e4d535d48 Mon Sep 17 00:00:00 2001 From: Jan Kurik Date: Tue, 15 Aug 2023 16:49:59 +0200 Subject: [PATCH] Rework of gating tests --- ci.fmf | 1 + gating.yaml | 14 +---- plans/{ci.fmf => gating.fmf} | 4 +- tests/Sanity/install-and-configure/Makefile | 64 --------------------- tests/Sanity/install-and-configure/PURPOSE | 6 -- tests/Sanity/install-and-configure/main.fmf | 10 +--- tests/Sanity/licence-check/main.fmf | 4 -- tests/main.fmf | 3 + 8 files changed, 9 insertions(+), 97 deletions(-) create mode 100644 ci.fmf rename plans/{ci.fmf => gating.fmf} (58%) delete mode 100644 tests/Sanity/install-and-configure/Makefile delete mode 100644 tests/Sanity/install-and-configure/PURPOSE create mode 100644 tests/main.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 ce3cdc1..116ac6c 100644 --- a/gating.yaml +++ b/gating.yaml @@ -4,16 +4,4 @@ product_versions: decision_context: bodhi_update_push_stable subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} ---- !Policy -product_versions: - - rhel-9 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/gating.functional} diff --git a/plans/ci.fmf b/plans/gating.fmf similarity index 58% rename from plans/ci.fmf rename to plans/gating.fmf index 1ad2c12..5ed0c31 100644 --- a/plans/ci.fmf +++ b/plans/gating.fmf @@ -1,6 +1,6 @@ summary: CI Gating Plan discover: how: fmf - directory: tests + filter: tag:gating execute: - how: beakerlib + how: tmt diff --git a/tests/Sanity/install-and-configure/Makefile b/tests/Sanity/install-and-configure/Makefile deleted file mode 100644 index 50cf85b..0000000 --- a/tests/Sanity/install-and-configure/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /tools/grafana-pcp/Sanity/install-and-configure -# Description: grafana testing via grafana testsuite -# Author: Jan Kuřík -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2019 Red Hat, Inc. -# -# This program is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of -# the License, or (at your option) any later version. -# -# 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, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/tools/grafana-pcp/Sanity/install-and-configure -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - test -x runtest.sh || chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Jan Kuřík " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: grafana-pcp testing as grafana datasource" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 2h" >> $(METADATA) - @echo "RunFor: grafana-pcp" >> $(METADATA) - @echo "Requires: grafana curl" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2+" >> $(METADATA) - @echo "Bug: 1685315" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5 -RHEL6 -RHEL7" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/Sanity/install-and-configure/PURPOSE b/tests/Sanity/install-and-configure/PURPOSE deleted file mode 100644 index 837a07a..0000000 --- a/tests/Sanity/install-and-configure/PURPOSE +++ /dev/null @@ -1,6 +0,0 @@ -PURPOSE of /tools/grafana-pcp/Sanity/install-and-configure -Description: grafana testing via grafana testsuite -Author: Jan Kuřík - -phantomjs excluded due to it is not available on all arches (it's no longer supported and upstream do not encourage it's use at all) - diff --git a/tests/Sanity/install-and-configure/main.fmf b/tests/Sanity/install-and-configure/main.fmf index a42f297..01c4331 100644 --- a/tests/Sanity/install-and-configure/main.fmf +++ b/tests/Sanity/install-and-configure/main.fmf @@ -1,16 +1,10 @@ summary: grafana-pcp testing as grafana datasource -description: |+ - phantomjs excluded due to it is not available on all arches (it's no longer supported and upstream do not encourage it's use at all) - -contact: -- Jan Kuřík -component: -- grafana-pcp test: ./runtest.sh -framework: beakerlib recommend: - grafana - curl duration: 2h +tag: +- gating extra-summary: /tools/grafana-pcp/Sanity/install-and-configure extra-task: /tools/grafana-pcp/Sanity/install-and-configure diff --git a/tests/Sanity/licence-check/main.fmf b/tests/Sanity/licence-check/main.fmf index 142ff4a..889db7b 100644 --- a/tests/Sanity/licence-check/main.fmf +++ b/tests/Sanity/licence-check/main.fmf @@ -3,10 +3,6 @@ test: ./test.sh link: - relates: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_1 - relates: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 -framework: beakerlib -component: -- grafana-pcp -contact: Jan Kuřík recommend: - grafana-pcp - rpm-build diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..e4ff873 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,3 @@ +contact: Jan Kuřík +component: grafana-pcp +framework: beakerlib