From 000b194da8ec660115b973f5761cbf1a71bde3fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Hrdina?= Date: Wed, 10 Jul 2024 14:09:00 +0200 Subject: [PATCH] Update fmf plans and gating.yaml --- gating.yaml | 25 +++++++++-- plans.fmf | 36 ++++++++++++++++ plans/public.fmf | 6 --- plans/tier1-internal.fmf | 15 ------- tests/fuzz/Makefile | 63 --------------------------- tests/fuzz/PURPOSE | 7 --- tests/fuzz/runtest.sh | 58 ------------------------- tests/smoke/Makefile | 63 --------------------------- tests/smoke/PURPOSE | 3 -- tests/smoke/runtest.sh | 93 ---------------------------------------- tests/tests.yml | 12 ------ 11 files changed, 57 insertions(+), 324 deletions(-) create mode 100644 plans.fmf delete mode 100644 plans/public.fmf delete mode 100644 plans/tier1-internal.fmf delete mode 100644 tests/fuzz/Makefile delete mode 100644 tests/fuzz/PURPOSE delete mode 100755 tests/fuzz/runtest.sh 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 diff --git a/gating.yaml b/gating.yaml index e979862..1b16508 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,8 +1,25 @@ --- !Policy product_versions: - - rhel-9 + - 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 0000000..b3e435b --- /dev/null +++ b/plans.fmf @@ -0,0 +1,36 @@ +/tier1-internal: + plan: + import: + url: https://src.fedoraproject.org/tests/expat.git + name: /plans/tier1/internal + +/tier1-public: + plan: + import: + url: https://src.fedoraproject.org/tests/expat.git + name: /plans/tier1/public + +/tier2-tier3-internal: + plan: + import: + url: https://src.fedoraproject.org/tests/expat.git + name: /plans/tier2-tier3/internal + +/tier2-tier3-public: + plan: + import: + url: https://src.fedoraproject.org/tests/expat.git + name: /plans/tier2-tier3/public + +/others-internal: + plan: + import: + url: https://src.fedoraproject.org/tests/expat.git + name: /plans/others/internal + +/others-public: + plan: + import: + url: https://src.fedoraproject.org/tests/expat.git + name: /plans/others/public + diff --git a/plans/public.fmf b/plans/public.fmf deleted file mode 100644 index 52f3165..0000000 --- a/plans/public.fmf +++ /dev/null @@ -1,6 +0,0 @@ -summary: Test plan that runs all tests from tests repo. -discover: - how: fmf - url: https://src.fedoraproject.org/tests/expat.git -execute: - how: tmt diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf deleted file mode 100644 index 2169e39..0000000 --- a/plans/tier1-internal.fmf +++ /dev/null @@ -1,15 +0,0 @@ -summary: CI plan, picks Tier1 tests, runs in beakerlib. -discover: - - name: rhel - how: fmf - filter: 'tier: 1' - url: git://pkgs.devel.redhat.com/tests/expat - - name: fedora - how: fmf - filter: 'tier: 1' - url: "https://src.fedoraproject.org/tests/expat.git" -execute: - how: tmt -adjust: - enabled: false - when: distro == centos-stream-9 diff --git a/tests/fuzz/Makefile b/tests/fuzz/Makefile deleted file mode 100644 index 9afbb30..0000000 --- a/tests/fuzz/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/expat/Sanity/fuzz -# Description: Feed expat with various random input -# Author: Petr Splichal -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# 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/expat/Sanity/fuzz -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: Feed expat with various random input" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 90m" >> $(METADATA) - @echo "RunFor: expat" >> $(METADATA) - @echo "Requires: expat" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/fuzz/PURPOSE b/tests/fuzz/PURPOSE deleted file mode 100644 index 50ae2dc..0000000 --- a/tests/fuzz/PURPOSE +++ /dev/null @@ -1,7 +0,0 @@ -PURPOSE of /CoreOS/expat/Sanity/fuzz -Description: Feed expat with various random input -Author: Petr Splichal - -This is a simple fuzzer. Tries to feed the expat library with -various random input. Makes sure it does not crash on it. Files -triggering possible failures are submitted to the scheduler. diff --git a/tests/fuzz/runtest.sh b/tests/fuzz/runtest.sh deleted file mode 100755 index 9d6a6f6..0000000 --- a/tests/fuzz/runtest.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/expat/Sanity/fuzz -# Description: Feed expat with various random input -# Author: Petr Splichal -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# 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="expat" -COUNT=${COUNT:-1000} - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlPhaseEnd - - rlPhaseStartTest - for i in `seq -w $COUNT`; do - rlRun "dd if=/dev/urandom of=file$i.xml bs=1024 count=100" \ - 0 "Creating file$i.xml with random content" - if ! rlRun "xmlwf file$i.xml" 0,2; then - rlFileSubmit "file$i.xml" - fi - done - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/tests/smoke/Makefile b/tests/smoke/Makefile deleted file mode 100644 index 381aad6..0000000 --- a/tests/smoke/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/expat/Sanity/smoke -# Description: Basic functionality test using xmlwf -# 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/expat/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) - 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: Basic functionality test using xmlwf" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: expat" >> $(METADATA) - @echo "Requires: expat" >> $(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 6255528..0000000 --- a/tests/smoke/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -PURPOSE of /CoreOS/expat/Sanity/smoke -Description: Basic functionality test using xmlwf -Author: Petr Splichal diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh deleted file mode 100755 index a16c58d..0000000 --- a/tests/smoke/runtest.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash -# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/expat/Sanity/smoke -# Description: Basic functionality test using xmlwf -# 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/lib/beakerlib/beakerlib.sh - -PACKAGE="expat" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - - # create test xml documents - rlRun "echo '' > empty.xml" 0 "Creating empty.xml" - rlRun "echo ' ' > nesting.xml" \ - 0 "Creating nesting.xml" - rlRun "echo ' is bad ' > quoting.xml" \ - 0 "Creating quoting.xml" - rlRun "echo 'contentcontent' > roots.xml" \ - 0 "Creating roots.xml" - rlRun "echo ' ]> &ent;' > external.xml" \ - 0 "Creating empty.xml" - rlRun "echo 'Content with something nested.' > well.xml" \ - 0 "Creating well.xml" - rlRun "echo 'ěščřžýáíé, 測試, בדיקה, परीक्षण, テスト, 테스트, тестирование, ทดสอบ'> utf8.xml" \ - 0 "Creating utf8.xml" - rlPhaseEnd - - rlPhaseStartTest - # emtpy - rlRun "xmlwf empty.xml | tee output" 0 "Testing empty xml" - rlAssertGrep "no element found" "output" - - # proper nesting - rlRun "xmlwf nesting.xml | tee output" 0 "Testing proper nesting" - rlAssertGrep "mismatched tag" "output" - - # quoting - rlRun "xmlwf < quoting.xml | tee output" 0 "Testing quoting (and redirection)" - rlAssertGrep "invalid token" "output" - - # two roots - rlRun "cat roots.xml | xmlwf | tee output" 0 "Testing proper nesting (and pipe)" - rlAssertGrep "junk after document element" "output" - - # external - rlRun "xmlwf -p external.xml | tee output" 0 "Testing external entity" - rlAssertGrep "mismatched tag" "output" - rlAssertGrep "error in processing external entity" "output" - - # well formed - rlRun "xmlwf well.xml | tee output" 0 "Testing well formed document" - rlAssertNotDiffer "output" "/dev/null" - - # utf8 characters - rlRun "xmlwf utf8.xml | tee output" 0 "Testing document with utf8 characters" - rlAssertNotDiffer "output" "/dev/null" - 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 413d54a..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -# This first play always runs on the local staging system -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - classic - - container - - atomic - tests: - - smoke - - fuzz