From eeb4f4104f62b87d9354b4d006439ad0e884dbad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Kadl=C4=8D=C3=ADk?= Date: Mon, 12 Aug 2024 14:40:25 +0200 Subject: [PATCH] Update the RHEL-10 gating plan - Replace the Beaker+TCMS jobs with Openstack jobs because TCMS has been declared obsoleted. - Remove the embedded tests because they haven't been used on RHEL anyway and were just partial and outdated copies of what already is in the Openstack jobs above/ This change aligns this component to what we already have in c10s GCC and annobin. --- gating.yaml | 3 +- tests/README | 3 - tests/Regression/testsuite2/Makefile | 64 -------------------- tests/Regression/testsuite2/PURPOSE | 3 - tests/Regression/testsuite2/main.fmf | 19 ------ tests/Regression/testsuite2/runtest.sh | 58 ------------------ tests/Sanity/smoke/Makefile | 63 -------------------- tests/Sanity/smoke/PURPOSE | 3 - tests/Sanity/smoke/files/false.asm | 7 --- tests/Sanity/smoke/files/false.bin | Bin 12 -> 0 bytes tests/Sanity/smoke/files/true.asm | 7 --- tests/Sanity/smoke/main.fmf | 14 ----- tests/Sanity/smoke/runtest.sh | 78 ------------------------- 13 files changed, 2 insertions(+), 320 deletions(-) delete mode 100644 tests/README delete mode 100644 tests/Regression/testsuite2/Makefile delete mode 100644 tests/Regression/testsuite2/PURPOSE delete mode 100644 tests/Regression/testsuite2/main.fmf delete mode 100755 tests/Regression/testsuite2/runtest.sh delete mode 100644 tests/Sanity/smoke/Makefile delete mode 100644 tests/Sanity/smoke/PURPOSE delete mode 100644 tests/Sanity/smoke/files/false.asm delete mode 100644 tests/Sanity/smoke/files/false.bin delete mode 100644 tests/Sanity/smoke/files/true.asm delete mode 100644 tests/Sanity/smoke/main.fmf delete mode 100755 tests/Sanity/smoke/runtest.sh diff --git a/gating.yaml b/gating.yaml index 7bba6a9..29239e8 100644 --- a/gating.yaml +++ b/gating.yaml @@ -10,4 +10,5 @@ product_versions: - rhel-10 decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-fast-lane.functional} + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-slow-lane.functional} diff --git a/tests/README b/tests/README deleted file mode 100644 index 85bfa9f..0000000 --- a/tests/README +++ /dev/null @@ -1,3 +0,0 @@ -Tests imported from RHEL keep their Makefile just for backward compatibility -with the traditional beakerlib test harness in RHEL. The Makefiles are _not_ -used in the Fedora CI infrastructure. diff --git a/tests/Regression/testsuite2/Makefile b/tests/Regression/testsuite2/Makefile deleted file mode 100644 index eaf64f3..0000000 --- a/tests/Regression/testsuite2/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /tools/nasm/Regression/testsuite2 -# Description: testsuite2 -# Author: Martin Cermak -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2019 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/nasm/Regression/testsuite2 -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: Martin Cermak " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: testsuite2" >> $(METADATA) - @echo "Type: Regression" >> $(METADATA) - @echo "TestTime: 48h" >> $(METADATA) - @echo "RunFor: nasm" >> $(METADATA) - @echo "Requires: nasm" >> $(METADATA) - @echo "Requires: perl autoconf asciidoc xmlto gcc make rpm-build" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2+" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5 -RHEL6 -RHEL7 -RedHatEnterpriseLinuxAlternateArchitectures7" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/Regression/testsuite2/PURPOSE b/tests/Regression/testsuite2/PURPOSE deleted file mode 100644 index 44ccb86..0000000 --- a/tests/Regression/testsuite2/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -PURPOSE of /tools/nasm/Regression/testsuite2 -Description: testsuite2 -Author: Martin Cermak diff --git a/tests/Regression/testsuite2/main.fmf b/tests/Regression/testsuite2/main.fmf deleted file mode 100644 index 8d8550d..0000000 --- a/tests/Regression/testsuite2/main.fmf +++ /dev/null @@ -1,19 +0,0 @@ -summary: testsuite2 -description: '' -contact: Martin Cermak -component: -- nasm -test: ./runtest.sh -framework: beakerlib -recommend: -- nasm -- perl -- autoconf -- asciidoc -- xmlto -- gcc -- make -- rpm-build -duration: 48h -extra-summary: /tools/nasm/Regression/testsuite2 -extra-task: /tools/nasm/Regression/testsuite2 diff --git a/tests/Regression/testsuite2/runtest.sh b/tests/Regression/testsuite2/runtest.sh deleted file mode 100755 index 90977c9..0000000 --- a/tests/Regression/testsuite2/runtest.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /tools/nasm/Regression/testsuite2 -# Description: testsuite2 -# Author: Martin Cermak -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2019 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="nasm" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "NVR=$(rpm -q --qf='%{NAME}-%{VERSION}-%{RELEASE}' $PACKAGE)" - rlRun "TMP=\$(mktemp -p $HOME -d)" - rlRun "pushd $TMP" - - rlRun "dnf download --disablerepo='*' --enablerepo=test-artifacts --source $NVR || cp /var/share/test-artifacts/$NVR.src.rpm ." - rlRun "dnf builddep -y $NVR.src.rpm --nobest" - rlRun "rpm --define='_topdir $TMP' -Uvh $NVR.src.rpm" - rlRun "rpmbuild --define='_topdir $TMP' -bc SPECS/nasm.spec" - rlPhaseEnd - - rlPhaseStartTest - rlRun "pushd BUILD/nasm-*/test" - rlRun "./performtest.pl --golden --nasm=/usr/bin/nasm --verbose $(ls *.asm | fgrep -v _version.asm | tr '\n' ' ')" - rlRun "./performtest.pl --nasm=/usr/bin/nasm --verbose $(ls *.asm | fgrep -v _version.asm | tr '\n' ' ')" - rlRun "popd" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TMP" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/tests/Sanity/smoke/Makefile b/tests/Sanity/smoke/Makefile deleted file mode 100644 index aab49ac..0000000 --- a/tests/Sanity/smoke/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /tools/nasm/Sanity/smoke -# Description: Smoke checks -# Author: Vaclav Kadlcik -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2021 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/nasm/Sanity/smoke -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE files - -.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: Vaclav Kadlcik " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Smoke checks" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 20m" >> $(METADATA) - @echo "RunFor: nasm" >> $(METADATA) - @echo "Requires: nasm binutils" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2+" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5 -RHEL6 -RHEL7 -RHEL-ALT-7" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/Sanity/smoke/PURPOSE b/tests/Sanity/smoke/PURPOSE deleted file mode 100644 index 66cb72c..0000000 --- a/tests/Sanity/smoke/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -PURPOSE of /tools/nasm/Sanity/smoke -Description: Smoke checks -Author: Vaclav Kadlcik diff --git a/tests/Sanity/smoke/files/false.asm b/tests/Sanity/smoke/files/false.asm deleted file mode 100644 index adc9852..0000000 --- a/tests/Sanity/smoke/files/false.asm +++ /dev/null @@ -1,7 +0,0 @@ - global _start - - section .text -_start: - mov rax, 60 ; sys_exit call - mov rdi, 1 ; value - syscall diff --git a/tests/Sanity/smoke/files/false.bin b/tests/Sanity/smoke/files/false.bin deleted file mode 100644 index 15bc832a88d2939a48039068838c1aaf683f3eca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12 ScmdmC!@$6>pAks#vjPARq5;VO diff --git a/tests/Sanity/smoke/files/true.asm b/tests/Sanity/smoke/files/true.asm deleted file mode 100644 index aab62aa..0000000 --- a/tests/Sanity/smoke/files/true.asm +++ /dev/null @@ -1,7 +0,0 @@ - global _start - - section .text -_start: - mov rax, 60 ; sys_exit call - mov rdi, 0 ; value - syscall diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf deleted file mode 100644 index 6676b6c..0000000 --- a/tests/Sanity/smoke/main.fmf +++ /dev/null @@ -1,14 +0,0 @@ -summary: Smoke checks -description: '' -contact: Vaclav Kadlcik -component: -- nasm -test: ./runtest.sh -framework: beakerlib -recommend: -- man -- nasm -- binutils -duration: 20m -extra-summary: /tools/nasm/Sanity/smoke -extra-task: /tools/nasm/Sanity/smoke diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh deleted file mode 100755 index 2c60ae1..0000000 --- a/tests/Sanity/smoke/runtest.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/env bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /tools/nasm/Sanity/smoke -# Description: Smoke checks -# Author: Vaclav Kadlcik -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2021 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 - -rlJournalStart - rlPhaseStartSetup - rlRun "TmpDir=\$(mktemp -d)" - rlRun "cp files/* $TmpDir" - rlRun "pushd $TmpDir" - rlPhaseEnd - - rlPhaseStartTest man - rlRun 'MANPAGER=cat MANWIDTH=16384 man nasm >man_nasm.out' - rlRun 'MANPAGER=cat MANWIDTH=16384 man ndisasm >man_ndisasm.out' - rlAssertGrep 'Netwide Assembler' man_nasm.out - rlAssertGrep 'Netwide Disassembler' man_ndisasm.out - rlPhaseEnd - - rlPhaseStartTest nasm - for i in true false; do - - # nasm itself - rlRun "nasm -felf64 ${i}.asm" - - # nasm is 80x86-specific so the following doesn't make sense - # anywhere else - if [[ $(uname -m) = x86_64 ]]; then - rlRun "ld -o $i $i.o" - if $i; then - rlRun "./$i" 0 - else - rlRun "./$i" 1 - fi - fi - - done - rlPhaseEnd - - rlPhaseStartTest ndisasm - # ndisasm is quite limited, we can't use it on anything but 'raw' binary - # code. "false.bin" is just the effective part "manually" cut out from - # "false.o". - rlRun 'ndisasm -b 64 false.bin >disassembled.txt' - rlAssertGrep 'mov eax' disassembled.txt -i - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd