From bc97b488604188f317671641a594436dd45cfd4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Hrdina?= Date: Thu, 31 Oct 2024 12:04:07 +0100 Subject: [PATCH] Update fmf plans and gating.yaml --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 25 ++++++-- plans.fmf | 36 +++++++++++ .../Makefile | 64 ------------------- .../PURPOSE | 9 --- .../runtest.sh | 64 ------------------- tests/tests.yml | 23 ------- .../Makefile | 63 ------------------ .../PURPOSE | 3 - .../exdoublequote | 2 - .../expounddoublequote | 2 - .../runtest.sh | 46 ------------- 13 files changed, 59 insertions(+), 280 deletions(-) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 plans.fmf delete mode 100644 tests/netrw-plugin-delete-command-broken/Makefile delete mode 100644 tests/netrw-plugin-delete-command-broken/PURPOSE delete mode 100755 tests/netrw-plugin-delete-command-broken/runtest.sh delete mode 100644 tests/tests.yml delete mode 100644 tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/Makefile delete mode 100644 tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/PURPOSE delete mode 100644 tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/exdoublequote delete mode 100644 tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/expounddoublequote delete mode 100755 tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/runtest.sh diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 00000000..c5aa0e08 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml index f422e3c3..b8d65b0e 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,8 +1,25 @@ --- !Policy product_versions: - - rhel-8 + - fedora-* +decision_context: bodhi_update_push_testing +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional} + +#Rawhide +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional} + +#gating rhel +--- !Policy +product_versions: + - rhel-* 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: baseos-ci.brew-build.acceptance-tier.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional} \ No newline at end of file diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 00000000..f7dabb0a --- /dev/null +++ b/plans.fmf @@ -0,0 +1,36 @@ +/tier1-internal: + plan: + import: + url: https://src.fedoraproject.org/tests/vim.git + name: /plans/tier1/internal + +/tier1-public: + plan: + import: + url: https://src.fedoraproject.org/tests/vim.git + name: /plans/tier1/public + +/tier2-tier3-internal: + plan: + import: + url: https://src.fedoraproject.org/tests/vim.git + name: /plans/tier2-tier3/internal + +/tier2-tier3-public: + plan: + import: + url: https://src.fedoraproject.org/tests/vim.git + name: /plans/tier2-tier3/public + +/others-internal: + plan: + import: + url: https://src.fedoraproject.org/tests/vim.git + name: /plans/others/internal + +/others-public: + plan: + import: + url: https://src.fedoraproject.org/tests/vim.git + name: /plans/others/public + diff --git a/tests/netrw-plugin-delete-command-broken/Makefile b/tests/netrw-plugin-delete-command-broken/Makefile deleted file mode 100644 index 8e1ea105..00000000 --- a/tests/netrw-plugin-delete-command-broken/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of netrw-plugin-delete-command-broken -# Description: Test for netrw plugin: delete command broken -# 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/vim/Regression/netrw-plugin-delete-command-broken -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: Petr Splichal " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Test for netrw plugin: delete command broken" >> $(METADATA) - @echo "Type: Regression" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: vim" >> $(METADATA) - @echo "Requires: vim" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Requires: vim-enhanced" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/netrw-plugin-delete-command-broken/PURPOSE b/tests/netrw-plugin-delete-command-broken/PURPOSE deleted file mode 100644 index 45af60a3..00000000 --- a/tests/netrw-plugin-delete-command-broken/PURPOSE +++ /dev/null @@ -1,9 +0,0 @@ -PURPOSE of netrw-plugin-delete-command-broken -Description: Test for netrw plugin: delete command broken -Author: Petr Splichal -Summary: netrw plugin: delete command broken - -Description: - -Regression to to verify the delete command of netrw plugin -successfully deletes files or directories. diff --git a/tests/netrw-plugin-delete-command-broken/runtest.sh b/tests/netrw-plugin-delete-command-broken/runtest.sh deleted file mode 100755 index 6dbf8c43..00000000 --- a/tests/netrw-plugin-delete-command-broken/runtest.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -# vim: dict=/usr/share/rhts-library/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/vim/Regression/netrw-plugin-delete-command-broken -# Description: Test for netrw plugin: delete command broken -# 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="vim-enhanced" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - # create test file & dir - rlRun "touch testfile" 0 "Creating test file" - rlRun "mkdir testdir" 0 "Creating test directory" - rlAssertExists "testfile" - rlAssertExists "testdir" - # create vim scripts - rlRun "echo '/testfile Dy :q' > scriptfile" \ - 0 "Creating file delete script" - rlRun "echo '/testdir Dy :q' > scriptdir" \ - 0 "Creating directory delete script" - rlPhaseEnd - - rlPhaseStartTest - rlRun "vim . -s scriptfile" 0 "Deleting file using netrw" - rlAssertNotExists "testfile" - rlRun "vim . -s scriptdir" 0 "Deleting directory using netrw" - rlAssertNotExists "testdir" - 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 7f01b5af..00000000 --- a/tests/tests.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# This first play always runs on the local staging system -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - classic - - container - tests: - - netrw-plugin-delete-command-broken - - vim-in-ex-mode-incorrectly-gives-an-eol-error - required_packages: - - vim-minimal - - vim-enhanced - -# Tests for Atomic Host -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - atomic - tests: - - vim-in-ex-mode-incorrectly-gives-an-eol-error diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/Makefile b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/Makefile deleted file mode 100644 index d442496b..00000000 --- a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error -# Description: Test for vim in ex mode incorrectly gives an eol error -# Author: David Kutalek -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2010 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/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE exdoublequote expounddoublequote - -.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: David Kutalek " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Test for vim in ex mode incorrectly gives an eol error" >> $(METADATA) - @echo "Type: Regression" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: vim" >> $(METADATA) - @echo "Requires: vim vim-minimal" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/PURPOSE b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/PURPOSE deleted file mode 100644 index 0d6d11a2..00000000 --- a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -PURPOSE of /CoreOS/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error -Description: Test for vim in ex mode incorrectly gives an eol error -Author: David Kutalek diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/exdoublequote b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/exdoublequote deleted file mode 100644 index 4037c883..00000000 --- a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/exdoublequote +++ /dev/null @@ -1,2 +0,0 @@ -" comment -q diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/expounddoublequote b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/expounddoublequote deleted file mode 100644 index ff821153..00000000 --- a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/expounddoublequote +++ /dev/null @@ -1,2 +0,0 @@ -#" comment -q diff --git a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/runtest.sh b/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/runtest.sh deleted file mode 100755 index 20967bc6..00000000 --- a/tests/vim-in-ex-mode-incorrectly-gives-an-eol-error/runtest.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/vim/Regression/vim-in-ex-mode-incorrectly-gives-an-eol-error -# Description: Test for vim in ex mode incorrectly gives an eol error -# Author: David Kutalek -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2010 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/lib/beakerlib/beakerlib.sh - -PACKAGE="vim" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm vim-minimal - rlPhaseEnd - - rlPhaseStartTest - rlRun "ex -u NONE ~/.bash_profile < ./exdoublequote" - rlRun "ex -u NONE ~/.bash_profile < ./expounddoublequote" - rlPhaseEnd - -rlJournalPrintText -rlJournalEnd