From b12fe9f482af032a2acf1aaf39c6b14f4b4fdbb2 Mon Sep 17 00:00:00 2001 From: Jesus Checa Hidalgo Date: Tue, 23 Apr 2024 08:06:58 +0200 Subject: [PATCH] test: Move librsvg2 and stratisd rebuild tests into rpm-rebuild test --- tests/Sanity/build-stratisd/Makefile | 63 --------------------- tests/Sanity/build-stratisd/PURPOSE | 3 - tests/Sanity/build-stratisd/main.fmf | 17 ------ tests/Sanity/build-stratisd/runtest.sh | 65 ---------------------- tests/Sanity/rpm-rebuild/librsvg2.fmf | 11 ++++ tests/Sanity/rpm-rebuild/stratisd.fmf | 6 ++ tests/Sanity/rpmbuild-librsvg2/Makefile | 65 ---------------------- tests/Sanity/rpmbuild-librsvg2/PURPOSE | 3 - tests/Sanity/rpmbuild-librsvg2/main.fmf | 18 ------ tests/Sanity/rpmbuild-librsvg2/runtest.sh | 68 ----------------------- 10 files changed, 17 insertions(+), 302 deletions(-) delete mode 100644 tests/Sanity/build-stratisd/Makefile delete mode 100644 tests/Sanity/build-stratisd/PURPOSE delete mode 100644 tests/Sanity/build-stratisd/main.fmf delete mode 100755 tests/Sanity/build-stratisd/runtest.sh create mode 100644 tests/Sanity/rpm-rebuild/librsvg2.fmf create mode 100644 tests/Sanity/rpm-rebuild/stratisd.fmf delete mode 100644 tests/Sanity/rpmbuild-librsvg2/Makefile delete mode 100644 tests/Sanity/rpmbuild-librsvg2/PURPOSE delete mode 100644 tests/Sanity/rpmbuild-librsvg2/main.fmf delete mode 100755 tests/Sanity/rpmbuild-librsvg2/runtest.sh diff --git a/tests/Sanity/build-stratisd/Makefile b/tests/Sanity/build-stratisd/Makefile deleted file mode 100644 index a085527..0000000 --- a/tests/Sanity/build-stratisd/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /tools/rust/Sanity/build-stratisd -# Description: rpmbuild stratisd -# Author: Edjunior Machado -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2018 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/rust/Sanity/build-stratisd -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: Edjunior Machado " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: rpmbuild stratisd" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 1h" >> $(METADATA) - @echo "RunFor: rust" >> $(METADATA) - @echo "Requires: rust rpm-build yum-utils stratisd" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2+" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Releases: RHEL8 RHEL9" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/Sanity/build-stratisd/PURPOSE b/tests/Sanity/build-stratisd/PURPOSE deleted file mode 100644 index c790991..0000000 --- a/tests/Sanity/build-stratisd/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -PURPOSE of /tools/rust/Sanity/build-stratisd -Description: rpmbuild stratisd -Author: Edjunior Machado diff --git a/tests/Sanity/build-stratisd/main.fmf b/tests/Sanity/build-stratisd/main.fmf deleted file mode 100644 index 0617757..0000000 --- a/tests/Sanity/build-stratisd/main.fmf +++ /dev/null @@ -1,17 +0,0 @@ -summary: rpmbuild stratisd -description: - - 'Ensure that rust does not break stratisd rpmbuild' -contact: - - Jesus Checa Hidalgo -component: - - rust -test: ./runtest.sh -framework: beakerlib -recommend: - - rust - - rpm-build - - yum-utils - - stratisd -duration: 1h -extra-summary: /tools/rust/Sanity/build-stratisd -extra-task: /tools/rust/Sanity/build-stratisd diff --git a/tests/Sanity/build-stratisd/runtest.sh b/tests/Sanity/build-stratisd/runtest.sh deleted file mode 100755 index 693a72f..0000000 --- a/tests/Sanity/build-stratisd/runtest.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /tools/rust/Sanity/build-stratisd -# Description: rpmbuild stratisd -# Author: Edjunior Machado -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2018 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="$(rpm -qf $(which rustc))" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE || rlDie "rustc not found. Aborting testcase..." - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlPhaseEnd - - PKG_TO_BUILD=stratisd - rlPhaseStart FAIL ${PKG_TO_BUILD}FetchSrcAndInstallBuildDeps - if ! rlCheckRpm $PKG_TO_BUILD; then - rlRun "yum install -y $PKG_TO_BUILD" - rlAssertRpm $PKG_TO_BUILD - fi - rlFetchSrcForInstalled $PKG_TO_BUILD - rlRun SRPM=$(ls -1 ${PKG_TO_BUILD}*src.rpm) - rlRun "rpm -ivh $SRPM" - rlRun SPECDIR="$(rpm -E '%{_specdir}')" - - rlRun "yum-builddep -y ${SRPM}" - rlPhaseEnd - - rlPhaseStartTest - set -o pipefail - rlRun "rpmbuild -bb ${SPECDIR}/${PKG_TO_BUILD}.spec |& tee ${SRPM}_rpmbuild.log" - rlFileSubmit "${SRPM}_rpmbuild.log" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/tests/Sanity/rpm-rebuild/librsvg2.fmf b/tests/Sanity/rpm-rebuild/librsvg2.fmf new file mode 100644 index 0000000..23e2f33 --- /dev/null +++ b/tests/Sanity/rpm-rebuild/librsvg2.fmf @@ -0,0 +1,11 @@ +summary+: ": librsvg2" +require+: + - librsvg2 +environment+: + PKG_TO_BUILD: "librsvg2" +duration: 20m + +adjust+: + # building librsvg2 in Fedora is very flaky. Do not run it there + - when: distro == fedora + enabled: false \ No newline at end of file diff --git a/tests/Sanity/rpm-rebuild/stratisd.fmf b/tests/Sanity/rpm-rebuild/stratisd.fmf new file mode 100644 index 0000000..64cce60 --- /dev/null +++ b/tests/Sanity/rpm-rebuild/stratisd.fmf @@ -0,0 +1,6 @@ +summary+: ": stratisd" +require+: + - stratisd +environment+: + PKG_TO_BUILD: "stratisd" +duration: 1h diff --git a/tests/Sanity/rpmbuild-librsvg2/Makefile b/tests/Sanity/rpmbuild-librsvg2/Makefile deleted file mode 100644 index bd22601..0000000 --- a/tests/Sanity/rpmbuild-librsvg2/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /tools/rust/Sanity/rpmbuild-librsvg2 -# Description: rpmbuild librsvg2 -# Author: Edjunior Machado -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2018 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/rust/Sanity/rpmbuild-librsvg2 -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: Edjunior Machado " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: rpmbuild librsvg2" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 1h" >> $(METADATA) - @echo "RunFor: rust" >> $(METADATA) - # Due to bz1980717 librsvg2 requires git to build the srpm, but it's missing - # from the BuildRequires - @echo "Requires: rust rpm-build yum-utils librsvg2 git" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2+" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Releases: RHEL8 RHEL9" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/Sanity/rpmbuild-librsvg2/PURPOSE b/tests/Sanity/rpmbuild-librsvg2/PURPOSE deleted file mode 100644 index d3a05af..0000000 --- a/tests/Sanity/rpmbuild-librsvg2/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -PURPOSE of /tools/rust/Sanity/rpmbuild-librsvg2 -Description: rpmbuild librsvg2 -Author: Edjunior Machado diff --git a/tests/Sanity/rpmbuild-librsvg2/main.fmf b/tests/Sanity/rpmbuild-librsvg2/main.fmf deleted file mode 100644 index decb64d..0000000 --- a/tests/Sanity/rpmbuild-librsvg2/main.fmf +++ /dev/null @@ -1,18 +0,0 @@ -summary: rpmbuild librsvg2 -description: - - 'Ensure that rust does not break librsvg2 rpmbuild' -contact: - - Jesus Checa Hidalgo -component: - - rust -test: ./runtest.sh -framework: beakerlib -recommend: - - rust - - rpm-build - - yum-utils - - librsvg2 - - git -duration: 1h -extra-summary: /tools/rust/Sanity/rpmbuild-librsvg2 -extra-task: /tools/rust/Sanity/rpmbuild-librsvg2 diff --git a/tests/Sanity/rpmbuild-librsvg2/runtest.sh b/tests/Sanity/rpmbuild-librsvg2/runtest.sh deleted file mode 100755 index 470ecb5..0000000 --- a/tests/Sanity/rpmbuild-librsvg2/runtest.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /tools/rust/Sanity/rpmbuild-librsvg2 -# Description: rpmbuild librsvg2 -# Author: Edjunior Machado -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2018 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="$(rpm -qf $(which rustc))" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE || rlDie "rustc not found. Aborting testcase..." - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "pushd $TmpDir" - rlPhaseEnd - - PKG_TO_BUILD=librsvg2 - rlPhaseStart FAIL ${PKG_TO_BUILD}FetchSrcAndInstallBuildDeps - if ! rlCheckRpm $PKG_TO_BUILD; then - rlRun "yum install -y $PKG_TO_BUILD ${YUM_SWITCHES}" - rlAssertRpm $PKG_TO_BUILD - fi - rlFetchSrcForInstalled $PKG_TO_BUILD - rlRun SRPM=$(ls -1 ${PKG_TO_BUILD}*src.rpm) - rlRun "rpm -ivh $SRPM" - rlRun SPECDIR="$(rpm -E '%{_specdir}')" - - # librsvg2 contains dynamic dependencies. builddep needs to be run - # from the srpm (not the spec file) to be able to generate them: - # https://fedoraproject.org/wiki/Changes/DynamicBuildRequires#rpmbuild - rlRun "yum-builddep -y ${SRPM} ${YUM_SWITCHES}" - rlPhaseEnd - - rlPhaseStartTest - set -o pipefail - rlRun "rpmbuild -bb ${SPECDIR}/${PKG_TO_BUILD}.spec |& tee ${SRPM}_rpmbuild.log" - rlFileSubmit "${SRPM}_rpmbuild.log" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd