From 7d101af9fefe69e9d753edc3236f6ffb2a79bc31 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 4 Feb 2021 07:39:41 +0100 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/js-d3-flame-graph.git#5e877b1f3632562475b976be2a51bd2a05254654 --- .fmf/version | 1 + README | 2 + gating.yaml | 19 ++++++ js-d3-flame-graph.spec | 5 +- plans/ci.fmf | 6 ++ 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 ++++++++++++++++++++++ 9 files changed, 186 insertions(+), 1 deletion(-) create mode 100644 .fmf/version create mode 100644 README create mode 100644 gating.yaml create mode 100644 plans/ci.fmf create mode 100644 tests/Sanity/upstream-testsuite/Makefile create mode 100644 tests/Sanity/upstream-testsuite/PURPOSE create mode 100644 tests/Sanity/upstream-testsuite/main.fmf create mode 100755 tests/Sanity/upstream-testsuite/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/README b/README new file mode 100644 index 0000000..9ad59d4 --- /dev/null +++ b/README @@ -0,0 +1,2 @@ +The test's Makefiles are not used in Fedora CI infrastructure. But are kept here +for backward compatibility with traditional beakerlib test harness in RHEL. diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..ce3cdc1 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,19 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} +--- !Policy +product_versions: + - rhel-8 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} +--- !Policy +product_versions: + - rhel-9 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} diff --git a/js-d3-flame-graph.spec b/js-d3-flame-graph.spec index 4af0d28..8adbfff 100644 --- a/js-d3-flame-graph.spec +++ b/js-d3-flame-graph.spec @@ -3,7 +3,7 @@ Name: js-d3-flame-graph Version: 3.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A D3.js plugin that produces flame graphs BuildArch: noarch @@ -85,6 +85,9 @@ cp -a dist/* %{buildroot}/%{_jsdir}/%{pkgname} %doc README.md examples %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 3.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 3.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/plans/ci.fmf b/plans/ci.fmf new file mode 100644 index 0000000..1ad2c12 --- /dev/null +++ b/plans/ci.fmf @@ -0,0 +1,6 @@ +summary: CI Gating Plan +discover: + how: fmf + directory: tests +execute: + how: beakerlib diff --git a/tests/Sanity/upstream-testsuite/Makefile b/tests/Sanity/upstream-testsuite/Makefile new file mode 100644 index 0000000..693d0d4 --- /dev/null +++ b/tests/Sanity/upstream-testsuite/Makefile @@ -0,0 +1,65 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# 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 new file mode 100644 index 0000000..1db14a8 --- /dev/null +++ b/tests/Sanity/upstream-testsuite/PURPOSE @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..85d51d9 --- /dev/null +++ b/tests/Sanity/upstream-testsuite/main.fmf @@ -0,0 +1,16 @@ +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 new file mode 100755 index 0000000..43b132d --- /dev/null +++ b/tests/Sanity/upstream-testsuite/runtest.sh @@ -0,0 +1,70 @@ +#!/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