Rework of gating tests

This commit is contained in:
Jan Kurik 2023-08-15 16:49:59 +02:00
parent 510e1df9ab
commit 8311ab8026
8 changed files with 9 additions and 97 deletions

1
ci.fmf Normal file
View File

@ -0,0 +1 @@
resultsdb-testcase: separate

View File

@ -4,16 +4,4 @@ product_versions:
decision_context: bodhi_update_push_stable decision_context: bodhi_update_push_stable
subject_type: koji_build subject_type: koji_build
rules: rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/gating.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}

View File

@ -1,6 +1,6 @@
summary: CI Gating Plan summary: CI Gating Plan
discover: discover:
how: fmf how: fmf
directory: tests filter: tag:gating
execute: execute:
how: beakerlib how: tmt

View File

@ -1,64 +0,0 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Makefile of /tools/grafana-pcp/Sanity/install-and-configure
# Description: grafana testing via grafana testsuite
# Author: Jan Kuřík <jkurik@redhat.com>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# 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 <jkurik@redhat.com>" > $(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)

View File

@ -1,6 +0,0 @@
PURPOSE of /tools/grafana-pcp/Sanity/install-and-configure
Description: grafana testing via grafana testsuite
Author: Jan Kuřík <jkurik@redhat.com>
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)

View File

@ -1,16 +1,10 @@
summary: grafana-pcp testing as grafana datasource 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 <jkurik@redhat.com>
component:
- grafana-pcp
test: ./runtest.sh test: ./runtest.sh
framework: beakerlib
recommend: recommend:
- grafana - grafana
- curl - curl
duration: 2h duration: 2h
tag:
- gating
extra-summary: /tools/grafana-pcp/Sanity/install-and-configure extra-summary: /tools/grafana-pcp/Sanity/install-and-configure
extra-task: /tools/grafana-pcp/Sanity/install-and-configure extra-task: /tools/grafana-pcp/Sanity/install-and-configure

View File

@ -3,10 +3,6 @@ test: ./test.sh
link: link:
- relates: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_1 - relates: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_1
- relates: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 - relates: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2
framework: beakerlib
component:
- grafana-pcp
contact: Jan Kuřík <jkurik@redhat.com>
recommend: recommend:
- grafana-pcp - grafana-pcp
- rpm-build - rpm-build

3
tests/main.fmf Normal file
View File

@ -0,0 +1,3 @@
contact: Jan Kuřík <jkurik@redhat.com>
component: grafana-pcp
framework: beakerlib