From ca721e78169cb9b7880a580af8b875a9e0212042 Mon Sep 17 00:00:00 2001 From: Jan Kurik Date: Fri, 10 May 2024 09:19:07 +0200 Subject: [PATCH] Cleanup of gating plans Resolves: RHEL-36043 --- .js-d3-flame-graph.metadata | 2 + plans/ci.fmf | 6 -- plans/gating.fmf | 7 +++ tests/Sanity/upstream-testsuite/Makefile | 65 -------------------- tests/Sanity/upstream-testsuite/PURPOSE | 3 - tests/Sanity/upstream-testsuite/main.fmf | 16 ----- tests/Sanity/upstream-testsuite/runtest.sh | 70 ---------------------- 7 files changed, 9 insertions(+), 160 deletions(-) create mode 100644 .js-d3-flame-graph.metadata delete mode 100644 plans/ci.fmf create mode 100644 plans/gating.fmf delete mode 100644 tests/Sanity/upstream-testsuite/Makefile delete mode 100644 tests/Sanity/upstream-testsuite/PURPOSE delete mode 100644 tests/Sanity/upstream-testsuite/main.fmf delete mode 100755 tests/Sanity/upstream-testsuite/runtest.sh diff --git a/.js-d3-flame-graph.metadata b/.js-d3-flame-graph.metadata new file mode 100644 index 0000000..f3e89a1 --- /dev/null +++ b/.js-d3-flame-graph.metadata @@ -0,0 +1,2 @@ +b80fbdf125fcadec5ec1b3d8acc216f6cbd4c2d5 d3-flame-graph-4.0.7.tar.gz +7dafbc87ec919cdb14e5b01fbdb115a75312f7fb js-d3-flame-graph-vendor-4.0.7-1.tar.xz diff --git a/plans/ci.fmf b/plans/ci.fmf deleted file mode 100644 index 1ad2c12..0000000 --- a/plans/ci.fmf +++ /dev/null @@ -1,6 +0,0 @@ -summary: CI Gating Plan -discover: - how: fmf - directory: tests -execute: - how: beakerlib diff --git a/plans/gating.fmf b/plans/gating.fmf new file mode 100644 index 0000000..bded7a2 --- /dev/null +++ b/plans/gating.fmf @@ -0,0 +1,7 @@ +summary: CI Gating Plan +discover: + how: fmf + filter: tag:gating + url: https://src.fedoraproject.org/rpms/js-d3-flame-graph.git +execute: + how: tmt diff --git a/tests/Sanity/upstream-testsuite/Makefile b/tests/Sanity/upstream-testsuite/Makefile deleted file mode 100644 index 693d0d4..0000000 --- a/tests/Sanity/upstream-testsuite/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /tools/js-d3-flame-graph/Sanity/upstream-testsuite -# Description: Upstream sanity testsuite -# Author: Jan Kuřík -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2020 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/js-d3-flame-graph/Sanity/upstream-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: Jan Kuřík " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Upstream sanity testsuite" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 15m" >> $(METADATA) - @echo "RunFor: js-d3-flame-graph" >> $(METADATA) - @echo "Requires: js-d3-flame-graph nodejs" >> $(METADATA) - @echo "Requires: make rpm-build" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2+" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Bug: 1788348" >> $(METADATA) - @echo "Releases: -RHEL4 -RHEL6 -RHEL7 -RHELClient5 -RHELServer5" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/Sanity/upstream-testsuite/PURPOSE b/tests/Sanity/upstream-testsuite/PURPOSE deleted file mode 100644 index 1db14a8..0000000 --- a/tests/Sanity/upstream-testsuite/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -PURPOSE of /tools/js-d3-flame-graph/Sanity/upstream-testsuite -Description: Upstream sanity testsuite -Author: Jan Kuřík diff --git a/tests/Sanity/upstream-testsuite/main.fmf b/tests/Sanity/upstream-testsuite/main.fmf deleted file mode 100644 index 85d51d9..0000000 --- a/tests/Sanity/upstream-testsuite/main.fmf +++ /dev/null @@ -1,16 +0,0 @@ -summary: Upstream sanity testsuite -description: '' -contact: -- Jan Kuřík -component: -- js-d3-flame-graph -test: ./runtest.sh -framework: beakerlib -recommend: -- js-d3-flame-graph -- nodejs -- make -- rpm-build -duration: 15m -extra-summary: /tools/js-d3-flame-graph/Sanity/upstream-testsuite -extra-task: /tools/js-d3-flame-graph/Sanity/upstream-testsuite diff --git a/tests/Sanity/upstream-testsuite/runtest.sh b/tests/Sanity/upstream-testsuite/runtest.sh deleted file mode 100755 index 43b132d..0000000 --- a/tests/Sanity/upstream-testsuite/runtest.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /tools/js-d3-flame-graph/Sanity/upstream-testsuite -# Description: Upstream sanity testsuite -# Author: Jan Kuřík -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2020 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/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="js-d3-flame-graph" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm "${PACKAGE}" ||\ - rlDie "Can not recover from the previous error" - rlFileBackup --missing-ok "/root/.npm" "/root/.bashrc" - rlRun "rm -rf /root/.npm" - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "pushd ${TmpDir}" - rlPhaseEnd - - rlPhaseStartTest "Prepare ${PACKAGE} for testing" - rlFetchSrcForInstalled "${PACKAGE}" \ - || rlDie "Can not download SRPM of ${PACKAGE} - giving up" - rlRun "rpm -D \"_topdir ${TmpDir}\" -U \ - $(rpm -q --qf '%{name}-%{version}-%{release}.src.rpm' ${PACKAGE}.noarch)" - rlRun "rpmbuild --nodeps -D \"_topdir ${TmpDir}\" \ - -bp ${TmpDir}/SPECS/${PACKAGE}.spec" - rlPhaseEnd - - rlPhaseStartTest "Run the upstream testsuite" - BDIR=$(rpm -q --qf '%{name}-%{version}' ${PACKAGE}.noarch) - P=$(sed 's/^js-//' <<< "${BDIR}") - if rlRun "pushd ${TmpDir}/BUILD/${P}/test"; then - rlRun "npm run test" - rlRun "popd" - else - rlFail "Can not find the working directory of the upstream testsuite" - fi - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -rf ${TmpDir}" 0 "Removing tmp directory" - rlRun "rm -rf /root/.npm" - rlFileRestore - rlPhaseEnd -rlJournalPrintText -rlJournalEnd