From 8b55237e5d7cc7138a42ab10b92618b68dd1b296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Hrdina?= Date: Fri, 19 Apr 2024 10:57:27 +0200 Subject: [PATCH] Update fmf plans and gating --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 6 +- plans.fmf | 36 +++++++++++ tests/README.rst | 0 .../Makefile | 63 ------------------- .../PURPOSE | 4 -- .../runtest.sh | 53 ---------------- tests/tests.yml | 28 --------- 9 files changed, 40 insertions(+), 152 deletions(-) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 plans.fmf delete mode 100644 tests/README.rst delete mode 100644 tests/filesystem-should-own-usr-share-licenses/Makefile delete mode 100644 tests/filesystem-should-own-usr-share-licenses/PURPOSE delete mode 100755 tests/filesystem-should-own-usr-share-licenses/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 b2f3e6a..1cb6d35 100644 --- a/gating.yaml +++ b/gating.yaml @@ -3,7 +3,5 @@ product_versions: - rhel-9 decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation} - - + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/internal/tier1-internal.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public/tier1-public.functional} \ No newline at end of file diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..342465a --- /dev/null +++ b/plans.fmf @@ -0,0 +1,36 @@ +/tier1-internal: + plan: + import: + url: https://src.fedoraproject.org/tests/filesystem.git + name: /plans/tier1/internal + +/tier1-public: + plan: + import: + url: https://src.fedoraproject.org/tests/filesystem.git + name: /plans/tier1/public + +/tier2-tier3-internal: + plan: + import: + url: https://src.fedoraproject.org/tests/filesystem.git + name: /plans/tier2-tier3/internal + +/tier2-tier3-public: + plan: + import: + url: https://src.fedoraproject.org/tests/filesystem.git + name: /plans/tier2-tier3/public + +/others-internal: + plan: + import: + url: https://src.fedoraproject.org/tests/filesystem.git + name: /plans/others/internal + +/others-public: + plan: + import: + url: https://src.fedoraproject.org/tests/filesystem.git + name: /plans/others/public + diff --git a/tests/README.rst b/tests/README.rst deleted file mode 100644 index e69de29..0000000 diff --git a/tests/filesystem-should-own-usr-share-licenses/Makefile b/tests/filesystem-should-own-usr-share-licenses/Makefile deleted file mode 100644 index 681c030..0000000 --- a/tests/filesystem-should-own-usr-share-licenses/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/filesystem/filesystem-should-own-usr-share-licenses -# Description: Test if filesystem owns /usr/share/licenses -# Author: Robin Hack -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# 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=/CoreOS/filesystem/filesystem-should-own-usr-share-licenses -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: Robin Hack " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Test if filesystem owns /usr/share/licenses" >> $(METADATA) - @echo "Type: Regression" >> $(METADATA) - @echo "TestTime: 20m" >> $(METADATA) - @echo "RunFor: filesystem" >> $(METADATA) - @echo "Requires: filesystem lvm2" >> $(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) diff --git a/tests/filesystem-should-own-usr-share-licenses/PURPOSE b/tests/filesystem-should-own-usr-share-licenses/PURPOSE deleted file mode 100644 index 57c5c98..0000000 --- a/tests/filesystem-should-own-usr-share-licenses/PURPOSE +++ /dev/null @@ -1,4 +0,0 @@ -PURPOSE of /CoreOS/filesystem/filesystem-should-own-usr-share-licenses -Description: Test if filesystem should owns /usr/share/licenses -Author: Robin Hack -Bug summary: filesystem should own /usr/share/licenses directory diff --git a/tests/filesystem-should-own-usr-share-licenses/runtest.sh b/tests/filesystem-should-own-usr-share-licenses/runtest.sh deleted file mode 100755 index 44d8b75..0000000 --- a/tests/filesystem-should-own-usr-share-licenses/runtest.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/filesystem/filesystem-should-own-usr-share-licenses -# Description: Test if filesystem owns /usr/share/licenses -# Author: Robin Hack -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# 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="filesystem" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlPhaseEnd - - rlPhaseStartTest - rlRun -s "LC_ALL=en_US.UTF-8 rpm -qf /usr/share/licenses/" - - rlAssertNotGrep "file /usr/share/licenses is not owned by any package" "${rlRun_LOG}" - rlAssertGrep "^filesystem" "${rlRun_LOG}" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 0b090c6..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,28 +0,0 @@ -- hosts: localhost - tags: - - classic - roles: - - role: standard-test-beakerlib - tests: - - filesystem-should-own-usr-share-licenses - required_packages: - - filesystem - - lvm2 -- hosts: localhost - tags: - - container - roles: - - role: standard-test-beakerlib - tests: - - filesystem-should-own-usr-share-licenses - required_packages: - - filesystem - - lvm2 -- hosts: localhost - tags: - - atomic - roles: - - role: standard-test-beakerlib - tests: - - filesystem-should-own-usr-share-licenses -