diff --git a/ci.fmf b/ci.fmf index c5aa0e0..b848c23 100644 --- a/ci.fmf +++ b/ci.fmf @@ -1 +1,5 @@ -resultsdb-testcase: separate +/gating: + plan: + import: + name: /plans/gating + url: https://gitlab.com/redhat/centos-stream/tests/js-d3-flame-graph.git diff --git a/gating.yaml b/gating.yaml index 116ac6c..282e16b 100644 --- a/gating.yaml +++ b/gating.yaml @@ -4,4 +4,4 @@ product_versions: decision_context: bodhi_update_push_stable subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/gating.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/plans/gating.fmf b/plans/gating.fmf deleted file mode 100644 index 5ed0c31..0000000 --- a/plans/gating.fmf +++ /dev/null @@ -1,6 +0,0 @@ -summary: CI Gating Plan -discover: - how: fmf - filter: tag:gating -execute: - how: tmt diff --git a/tests/Sanity/licence-check/epel.repo b/tests/Sanity/licence-check/epel.repo deleted file mode 100644 index d52a962..0000000 --- a/tests/Sanity/licence-check/epel.repo +++ /dev/null @@ -1,30 +0,0 @@ -[epel] -name=Extra Packages for Enterprise Linux $releasever - $basearch -# It is much more secure to use the metalink, but if you wish to use a local mirror -# place its address here. -#baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled = 0 -gpgcheck=1 -countme=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever - -[epel-debuginfo] -name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug -# It is much more secure to use the metalink, but if you wish to use a local mirror -# place its address here. -#baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch/debug/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever -gpgcheck=1 - -[epel-source] -name=Extra Packages for Enterprise Linux $releasever - $basearch - Source -# It is much more secure to use the metalink, but if you wish to use a local mirror -# place its address here. -#baseurl=https://download.example/pub/epel/$releasever/Everything/source/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever -gpgcheck=1 diff --git a/tests/Sanity/licence-check/main.fmf b/tests/Sanity/licence-check/main.fmf deleted file mode 100644 index 68f06ec..0000000 --- a/tests/Sanity/licence-check/main.fmf +++ /dev/null @@ -1,17 +0,0 @@ -summary: Chek for used licenses in packages -test: ./test.sh -link: - - relates: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_1 - - relates: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 -recommend: -- rpm-build -- license-validate -- js-d3-flame-graph -duration: 15m -tag: - - gating -enabled: true -adjust: - - enabled: false - continue: false - when: distro != fedora diff --git a/tests/Sanity/licence-check/test.sh b/tests/Sanity/licence-check/test.sh deleted file mode 100755 index 68caa66..0000000 --- a/tests/Sanity/licence-check/test.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE=js-d3-flame-graph -TCWD="$(pwd)" - -rlJournalStart - rlPhaseStartSetup - rlRun "tmp=\$(mktemp -d /var/tmp/XXXXXXXXXXXXX)" 0 "Create tmp directory" - rlRun "pushd $tmp" - rlRun "set -o pipefail" - - # Get list of rpms - rlFetchSrcForInstalled --quiet "${PACKAGE}" || \ - rlDie 'Can not get source package of ${PACKAGE} .... giving up...' - SOURCEPKG=$(rpm -q --qf '%{name}-%{version}-%{release}.src.rpm' ${PACKAGE}) - rlAssertExists "${tmp}/${SOURCEPKG}" - rlRun "rpm -D '_topdir ${tmp}' -i ${tmp}/${SOURCEPKG}" - rlRun "LICENSES=\"\$(rpm -q --qf '%{license}\n' --specfile ${tmp}/SPECS/${PACKAGE}.spec\ - | sed -e 's/ and /\\n/g' -e 's/^ *//' -e 's/ *$//')\"" - rlRun "TUPLE=\"\$(rpm -q --qf '%{name} %{license}\n' \ - --specfile ${tmp}/SPECS/${PACKAGE}.spec )\"" - rlPhaseEnd - -while read l; do - rlPhaseStart FAIL "License check of ${l}" - retcode= - rlRun -s "license-validate '${l}'" || retcode=Fail - - # Report affected packages - if [[ -n "${retcode}" ]]; then - rlLogInfo "The following packages needs to fix the ${l} license:" - #for p in $(awk "\$0~/${l}/{print \$1;}" <<< "${TUPLE}"); do - for p in $(grep "${l}" <<< "${TUPLE}" | cut -d ' ' -f 1); do - rlLogInfo " - ${p}" - done - fi - rlPhaseEnd -done < <(sort -u <<< "${LICENSES}") - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $tmp" 0 "Remove tmp directory" - rlPhaseEnd -rlJournalEnd 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 c8d3659..0000000 --- a/tests/Sanity/upstream-testsuite/main.fmf +++ /dev/null @@ -1,14 +0,0 @@ -summary: Upstream sanity testsuite -test: ./runtest.sh -recommend: - - js-d3-flame-graph - - nodejs - - make - - rpm-build -tag: - - gating - - upgrade -tier: 1 -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 diff --git a/tests/main.fmf b/tests/main.fmf deleted file mode 100644 index edb3f06..0000000 --- a/tests/main.fmf +++ /dev/null @@ -1,3 +0,0 @@ -contact: Jan Kuřík -component: js-d3-flame-graph -framework: beakerlib