From fd566170741f7912d8fcdb9f6787fd8ce25e9170 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Mon, 25 Nov 2024 13:41:38 +0100 Subject: [PATCH] Migrate to TMT-style gating in C9S This is required for RHIVOS, see VROOM-23635. --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 3 +- plans/tier1-internal.fmf | 11 +++++ tests/smoke/Makefile | 63 ---------------------------- tests/smoke/PURPOSE | 3 -- tests/smoke/runtest.sh | 64 ---------------------------- tests/tests.yml | 14 ------- tests/xautofs/Makefile | 65 ----------------------------- tests/xautofs/PURPOSE | 8 ---- tests/xautofs/runtest.sh | 90 ---------------------------------------- 11 files changed, 14 insertions(+), 309 deletions(-) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 plans/tier1-internal.fmf delete mode 100644 tests/smoke/Makefile delete mode 100644 tests/smoke/PURPOSE delete mode 100755 tests/smoke/runtest.sh delete mode 100644 tests/tests.yml delete mode 100644 tests/xautofs/Makefile delete mode 100644 tests/xautofs/PURPOSE delete mode 100755 tests/xautofs/runtest.sh 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 475371b..f7de446 100644 --- a/gating.yaml +++ b/gating.yaml @@ -3,5 +3,4 @@ product_versions: - rhel-9 decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional} diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf new file mode 100644 index 0000000..20d1776 --- /dev/null +++ b/plans/tier1-internal.fmf @@ -0,0 +1,11 @@ +summary: Internal gating tests plan +discover: + - name: Internal gating tests + how: fmf + filter: 'tag: Tier1,Tier2,Tier3 & tag: -rhel-buildroot' + url: https://pkgs.devel.redhat.com/git/tests/findutils +execute: + how: tmt +adjust: + enabled: false + when: distro == centos-stream or distro == fedora diff --git a/tests/smoke/Makefile b/tests/smoke/Makefile deleted file mode 100644 index a68f70e..0000000 --- a/tests/smoke/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/findutils/Sanity/smoke -# Description: Smoke test for find and xargs. -# Author: Branislav Nater -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2014 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/findutils/Sanity/smoke -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: Branislav Nater " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Smoke test for find and xargs." >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: findutils" >> $(METADATA) - @echo "Requires: findutils" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/smoke/PURPOSE b/tests/smoke/PURPOSE deleted file mode 100644 index 87a1ce1..0000000 --- a/tests/smoke/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -PURPOSE of /CoreOS/findutils/Sanity/smoke -Description: Smoke test for find and xargs. -Author: Branislav Nater diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh deleted file mode 100755 index 438548d..0000000 --- a/tests/smoke/runtest.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/findutils/Sanity/smoke -# Description: Smoke test for find and xargs. -# Author: Branislav Nater -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2014 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include rhts environment -. /usr/bin/rhts-environment.sh || exit 1 -. /usr/lib/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="findutils" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlRun "touch \"file with spaces\"" 0 - rlRun "mkdir dir" 0 - rlRun "touch dir/file1" 0 - rlPhaseEnd - - rlGetTestState && { - rlPhaseStartTest - rlRun "find . -name \"file*\" -type f | tee output | wc -l > wcout" 0 - cat output - rlAssertGrep 2 wcout - rlRun "find $TmpDir -mindepth 1 -type d | tee output | wc -l > wcout" 0 - cat output - rlAssertGrep 1 wcout - rlRun "find $TmpDir -name \"file*\" -print0 | xargs -0 ls -l | tee output | wc -l > wcout" 0 - cat output - rlAssertGrep 2 wcout - rlPhaseEnd - } - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalEnd -rlJournalPrintText diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 636db22..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -# Tests which will run in all contexts -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - classic - - container - - atomic - tests: - - smoke - - xautofs - required_packages: - - autofs # autofs required for xautofs test diff --git a/tests/xautofs/Makefile b/tests/xautofs/Makefile deleted file mode 100644 index d273b6f..0000000 --- a/tests/xautofs/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/findutils/Sanity/options/xautofs -# Description: Check xautofs option -# Author: Petr Splichal -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2009 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/findutils/Sanity/options/xautofs -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) - chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Branislav Nater " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Check xautofs option" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 10m" >> $(METADATA) - @echo "RunFor: findutils" >> $(METADATA) - @echo "Requires: autofs findutils" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Bug: 485672 529391" >> $(METADATA) - @echo "Releases: -RHEL3 -RHEL4" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/xautofs/PURPOSE b/tests/xautofs/PURPOSE deleted file mode 100644 index e20bfd1..0000000 --- a/tests/xautofs/PURPOSE +++ /dev/null @@ -1,8 +0,0 @@ -PURPOSE of /CoreOS/findutils/Sanity/options/xautofs -Description: Check xautofs option -Author: Petr Splichal -Bug summary: [RFE] Modify find to be able to skip direct mapped autofs mounts -Bugzilla link: None - -Check that the new -xautofs option works as expected: make sure -find does not descend into directories on autofs filesystems. diff --git a/tests/xautofs/runtest.sh b/tests/xautofs/runtest.sh deleted file mode 100755 index a0a2cb1..0000000 --- a/tests/xautofs/runtest.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash -# vim: dict=/usr/share/rhts-library/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/findutils/Sanity/options/xautofs -# Description: Check xautofs option -# Author: Petr Splichal -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2009 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# 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, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include rhts environment -. /usr/bin/rhts-environment.sh -. /usr/share/rhts-library/rhtslib.sh - -PACKAGE="findutils" - -MasterConf="/etc/auto.master" -DirectConf="/etc/auto.direct" - -MountDir="/mnt/findutils" -AutomountDir="$MountDir/etc" -RegularDir="$MountDir/regular/directory/master" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlAssertRpm "autofs" - rlRun "set -o pipefail" - - # create dirs & back up - rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" - rlRun "mkdir -p $RegularDir" 0 "Creating regular directory" - rlRun "rlFileBackup $MasterConf" - - # set up autofs - rlRun "echo '/- /etc/auto.direct' > $MasterConf" \ - 0 "Setting up autofs master map" - rlRun "echo '$AutomountDir localhost:/etc' > $DirectConf" \ - 0 "Setting up autofs direct map" - - # RHEL-7 is using xfs - rlIsRHEL 4 5 6 && fs="ext[34]" || fs="xfs" - - rlRun "pushd $TmpDir" - rlPhaseEnd - - rlPhaseStartTest "Without -xautofs option" - rlRun "rlServiceStart autofs" 0 "Starting autofs" - rlAssertNotGrep "$AutomountDir.*$fs" "/proc/mounts" - rlRun "find $MountDir -noleaf -name '*master*' | tee filelist" - rlAssertGrep "$RegularDir" "filelist" - rlAssertGrep "$MountDir$MasterConf" "filelist" - rlAssertGrep "$AutomountDir.*$fs" "/proc/mounts" - rlPhaseEnd - - rlPhaseStartTest "With -xautofs option" - rlRun "rlServiceStart autofs" 0 "Starting autofs" - rlAssertNotGrep "$AutomountDir.*$fs" "/proc/mounts" - rlRun "find $MountDir -xautofs -noleaf -name '*master*' | tee filelist" - rlAssertGrep "$RegularDir" "filelist" - rlAssertNotGrep "$MountDir$MasterConf" "filelist" - rlAssertNotGrep "$AutomountDir.*$fs" "/proc/mounts" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rlFileRestore" - rlRun "rlServiceRestore autofs" - rlRun "rm -r $TmpDir $DirectConf $MountDir" 0 "Removing tmp files" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd