CI: Use FMF test format instead of STI

Use FMF test format for easier use with RHEL9 and Testing Farm.
This commit is contained in:
Martin Cermak 2021-06-11 07:56:31 +00:00
parent e95f26d994
commit ee466eda5d
7 changed files with 51 additions and 141 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

6
plans/ci.fmf Normal file
View File

@ -0,0 +1,6 @@
summary: CI Gating Plan
discover:
how: fmf
directory: tests
execute:
how: beakerlib

View File

@ -1,63 +0,0 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Makefile of /tools/libmpc/Regression/internal-testsuite
# Description: internal-testsuite
# Author: Martin Coufal <mcoufal@redhat.com>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Copyright (c) 2016 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/libmpc/Regression/internal-testsuite
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: Martin Coufal <mcoufal@redhat.com>" > $(METADATA)
@echo "Name: $(TEST)" >> $(METADATA)
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
@echo "Path: $(TEST_DIR)" >> $(METADATA)
@echo "Description: internal-testsuite" >> $(METADATA)
@echo "Type: Regression" >> $(METADATA)
@echo "TestTime: 30m" >> $(METADATA)
@echo "RunFor: libmpc" >> $(METADATA)
@echo "Requires: libmpc gmp-devel mpfr-devel texinfo rpm-build gcc gcc-c++" >> $(METADATA)
@echo "Priority: Normal" >> $(METADATA)
@echo "License: GPLv2+" >> $(METADATA)
@echo "Confidential: no" >> $(METADATA)
@echo "Destructive: no" >> $(METADATA)
@echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
rhts-lint $(METADATA)

View File

@ -1,60 +0,0 @@
#!/bin/bash
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# runtest.sh of /tools/libmpc/Regression/internal-testsuite
# Description: internal-testsuite
# Author: Martin Coufal <mcoufal@redhat.com>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Copyright (c) 2016 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/.
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Include Beaker environment
. /usr/bin/rhts-environment.sh || exit 1
. /usr/share/beakerlib/beakerlib.sh || exit 1
PACKAGE="${PACKAGE:-$(rpm -qf --qf='%{name}\n' /usr/lib64/libmpc.so.3)}"
export PACKAGE
rlJournalStart
rlPhaseStartSetup
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
rlRun "pushd $TmpDir"
rlFetchSrcForInstalled $PACKAGE
rlAssertRpm $PACKAGE
rlRun "dnf builddep -y $PACKAGE"
rlRun "rpm --define='_topdir $TmpDir' -Uvh *src.rpm"
rlRun "rpmbuild --define='_topdir $TmpDir' -bc SPECS/libmpc.spec"
rlPhaseEnd
rlPhaseStartTest
rlRun "pushd BUILD/mpc-*"
# test
rlRun "make RUNTESTFLAGS='--tool_exec=$BIN' check |& tee $TmpDir/check.log"
rlRun "popd"
# no unexpected results should appear
rlRun "grep '^# of unexpected' check.log" 1
rlPhaseEnd
rlPhaseStartCleanup
rlRun "popd"
rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
rlPhaseEnd
rlJournalPrintText
rlJournalEnd

View File

@ -0,0 +1,44 @@
summary: internal-testsuite
description: "#!/bin/bash\n# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k\n\
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n#\n# \
\ runtest.sh of /tools/libmpc/Regression/internal-testsuite\n# Description:\
\ internal-testsuite\n# Author: Martin Coufal <mcoufal@redhat.com>\n#\n# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n\
#\n# Copyright (c) 2016 Red Hat, Inc.\n#\n# This program is free software:\
\ you can redistribute it and/or\n# modify it under the terms of the GNU General\
\ Public License as\n# published by the Free Software Foundation, either version\
\ 2 of\n# the License, or (at your option) any later version.\n#\n# This program\
\ is distributed in the hope that it will be\n# useful, but WITHOUT ANY WARRANTY;\
\ without even the implied\n# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\n\
# PURPOSE. See the GNU General Public License for more details.\n#\n# You\
\ should have received a copy of the GNU General Public License\n# along with\
\ this program. If not, see http://www.gnu.org/licenses/.\n#\n# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n\
\n# Include Beaker environment\n. /usr/bin/rhts-environment.sh || exit 1\n. /usr/share/beakerlib/beakerlib.sh\
\ || exit 1\n\nPACKAGE=\"${PACKAGE:-$(rpm -qf --qf='%{name}\\n' /usr/lib64/libmpc.so.3)}\"\
\nexport PACKAGE\n\nrlJournalStart\n rlPhaseStartSetup\n rlRun \"TmpDir=\\\
$(mktemp -d)\" 0 \"Creating tmp directory\"\n rlRun \"pushd $TmpDir\"\n\
\trlFetchSrcForInstalled $PACKAGE\n\trlAssertRpm $PACKAGE\n\trlRun \"dnf builddep\
\ -y $PACKAGE\"\n rlRun \"rpm --define='_topdir $TmpDir' -Uvh *src.rpm\"\
\n rlRun \"rpmbuild --define='_topdir $TmpDir' -bc SPECS/libmpc.spec\"\n\
\ rlPhaseEnd\n\n rlPhaseStartTest\n\trlRun \"pushd BUILD/mpc-*\"\n \
\ # test\n rlRun \"make RUNTESTFLAGS='--tool_exec=$BIN' check |& tee\
\ $TmpDir/check.log\"\n rlRun \"popd\"\n # no unexpected results\
\ should appear\n rlRun \"grep '^# of unexpected' check.log\" 1\n rlPhaseEnd\n\
\n rlPhaseStartCleanup\n rlRun \"popd\"\n rlRun \"rm -r $TmpDir\"\
\ 0 \"Removing tmp directory\"\n rlPhaseEnd\nrlJournalPrintText\nrlJournalEnd\n"
contact:
- Martin Coufal <mcoufal@redhat.com>
component:
- libmpc
test: ./runtest.sh
framework: beakerlib
recommend:
- libmpc
- gmp-devel
- mpfr-devel
- texinfo
- rpm-build
- gcc
- gcc-c++
duration: 30m
extra-summary: /tools/libmpc/Regression/internal-testsuite
extra-task: /tools/libmpc/Regression/internal-testsuite

1
tests/internal-testsuite/runtest.sh Normal file → Executable file
View File

@ -26,7 +26,6 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Include Beaker environment
. /usr/bin/rhts-environment.sh || exit 1
. /usr/share/beakerlib/beakerlib.sh || exit 1
PACKAGE="${PACKAGE:-$(rpm -qf --qf='%{name}\n' /usr/lib64/libmpc.so.3)}"

View File

@ -1,17 +0,0 @@
---
# This first play always runs on the local staging system
- hosts: localhost
roles:
- role: standard-test-beakerlib
tags:
- classic
tests:
- internal-testsuite
required_packages:
- libmpc
- gmp-devel
- mpfr-devel
- texinfo
- rpm-build
- gcc
- gcc-c++