From d2e97ad8afa3f860cc8930d702b6f5a400222b21 Mon Sep 17 00:00:00 2001 From: "Ziqian SUN (Zamir)" Date: Wed, 15 Jan 2025 15:14:36 +0800 Subject: [PATCH] tests: Switch to standard-test-basic for RHEL-10 Signed-off-by: Ziqian SUN (Zamir) --- tests/sanity/Makefile | 62 ------------------------------------------- tests/sanity/metadata | 2 +- tests/tests.yml | 2 +- 3 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 tests/sanity/Makefile diff --git a/tests/sanity/Makefile b/tests/sanity/Makefile deleted file mode 100644 index 7753aca..0000000 --- a/tests/sanity/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Description: Gating test for ddiskit -# Author: Ziqian SUN (Zamir) -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2022 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. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -TOPLEVEL_NAMESPACE=kernel -PACKAGE_NAME=ddiskit -RELATIVE_PATH=general/ddiskit/gating - -export TESTVERSION=1.0 -export TEST=/$(TOPLEVEL_NAMESPACE)/$(RELATIVE_PATH) - -.PHONY: all install download clean - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - chmod a+x ./runtest.sh - -clean: - rm -f *~ *.rpm $(BUILT_FILES) - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @touch $(METADATA) - @echo "Owner: Ziqian SUN (Zamir) " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Description: ddiskit gating test">> $(METADATA) - @echo "TestTime: 90m" >> $(METADATA) - @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA) - @echo "Requires: gcc kernel-devel ddiskit" >> $(METADATA) - @echo "RhtsRequires: " >> $(METADATA) diff --git a/tests/sanity/metadata b/tests/sanity/metadata index d8958b7..534a5b7 100644 --- a/tests/sanity/metadata +++ b/tests/sanity/metadata @@ -7,7 +7,7 @@ confidential=no destructive=no [restraint] -entry_point=make run +entry_point=./runtest.sh max_time=90m dependencies=ddiskit softDependencies=kernel-devel diff --git a/tests/tests.yml b/tests/tests.yml index 1f35a2f..5fa466c 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -2,7 +2,7 @@ tags: - classic roles: - - role: standard-test-beakerlib + - role: standard-test-basic tests: - sanity required_packages: