Compare commits

...

3 Commits

Author SHA1 Message Date
Václav Kadlčík
b8c094a735 Standardize tier1 in gating
The tier1 tests were traditionally run by BaseOS CI by various
tasks if the baseos-ci.brew-build.* family, typically implemented
by Beaker jobs.

Every component used to have its own special flavor of the
configuration, both in BaseOS CI (the triggering part) and here in
the component's gating.yaml (results processing).

The each-component-is-a-snowflake approach didn't work very well,
creating discrepancies like RHEL-140879.

At long last, I've unified the BaseOS CI configuration for all my
components:
- drop the Beaker job(s) (which have been declared obsoleted anyway)
- trigger two OpenStack jobs
  - "fast lane" for architectures where we usually get results fast,
    sometimes it's advantageous to take a look ASAP
  - "slow lane" for architectures we typically have to wait
For reference, it's commit d2baef686 in baseos-qe/citool-config.

Now I'm fixing the counterpart in gating.yaml (results processing):
We wait for the "fast lane" and "slow lane" results and they both
must pass.
2026-02-13 14:33:35 +01:00
Václav Kadlčík
a17b3d7bdf Extend tier0 coverage
Replace the existing STI smoke test with a reference to the top tie of
https://gitlab.com/redhat/centos-stream/tests/gcc-toolset-metapackage
2025-09-10 14:19:45 +02:00
Siddhesh Poyarekar
ee19cb7d30 Drop the sudo wrapper script
Resolves: RHEL-90066
2025-05-21 11:24:06 -04:00
8 changed files with 38 additions and 37 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

View File

@ -3,5 +3,5 @@ product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.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}

View File

@ -8,13 +8,12 @@ BuildRequires: scl-utils-build
Summary: Package that installs %scl
Name: %scl_name
Version: 14.0
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+
Group: Applications/File
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: README
Source1: sudo.sh
Source2: gts-annobin-plugin-select.sh
Source1: gts-annobin-plugin-select.sh
Requires: %{scl_prefix}runtime
Requires: %{scl_prefix}gcc %{scl_prefix}gcc-c++ %{scl_prefix}gcc-gfortran
@ -106,12 +105,6 @@ export LD_LIBRARY_PATH=%{_scl_root}\$rpmlibdir\$rpmlibdir64\$rpmlibdir32\${LD_LI
export PKG_CONFIG_PATH=%{_libdir}/pkgconfig\${PKG_CONFIG_PATH:+:\${PKG_CONFIG_PATH}}
EOF
# Sudo script
# ===========
cat <<'EOF' > sudo
%{expand:%(cat %{SOURCE1})}
EOF
%install
(%{scl_install})
@ -130,7 +123,6 @@ install -d -m 755 %{buildroot}%{_scl_scripts}
install -p -m 755 enable %{buildroot}%{_scl_scripts}/
install -d -m 755 %{buildroot}%{_scl_scripts}
install -p -m 755 sudo %{buildroot}%{_bindir}/
# Other directories that should be owned by the runtime
install -d -m 755 %{buildroot}%{_datadir}/appdata
@ -145,7 +137,7 @@ install -p -m 644 %{?scl_name}.7 %{buildroot}%{_mandir}/man7/
# Install the plugin selector trigger script.
mkdir -p %{buildroot}%{rrcdir}
install -p -m 755 %{SOURCE2} %{buildroot}%{rrcdir}/
install -p -m 755 %{SOURCE1} %{buildroot}%{rrcdir}/
# This trigger is used to decide which version of the annobin plugin for gcc
# should be used. See comments in the script for full details.
@ -191,6 +183,9 @@ if [ $1 = 0 ]; then
fi
%changelog
* Wed May 21 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 14.0-2
- Drop the sudo wrapper script (RHEL-90066)
* Wed Aug 14 2024 Marek Polacek <polacek@redhat.com> - 14.0-1
- don't require gdb on RHEL9 (RHEL-54245)

29
plans/tier0.fmf Normal file
View File

@ -0,0 +1,29 @@
# Tier 0 test plan. It's actually Tier 1
# - limited to its public part
# - executed on the architecture at hand
# When run by osci.tier0 on CentOS Stream or RHEL, it receives the following
# context:
# arch=x86_64 (the architecture at hand, currently OSCI uses just x86_64)
# distro=rhel<M>.<m> (even for CentOS Stream builds)
# trigger=build
summary: Tier 0 test plan
context:
component: gcc-toolset-14
discover:
- name: collect_info
how: shell
tests:
- name: /info/rpms
test: rpm -qa --last
- name: public_tests
how: fmf
url: https://gitlab.com/redhat/centos-stream/tests/gcc-toolset-metapackage.git
filter: tier:1
execute:
how: tmt
prepare+:
how: shell
environment+:
COLLECTIONS: gcc-toolset-14
WITH_SCL: "scl enable gcc-toolset-14"

View File

@ -1,3 +1,2 @@
SHA512 (gts-annobin-plugin-select.sh) = f5e5f4dc054bdd09c6d185bc3c671376ff8b825c8fa3f2969e25e10358405aa105f74154c63b6dc025cbe7e09eb24693664048685aaf481cc2a65d12ad9476b8
SHA512 (README) = a4ed9ea6bb2cdc32cc908cdaf56faf6a813712c2b807a31e286a5fa2faead5285be025363b66d699e30afe34213c66421b76321ef0ca7b57e5e3c5610d32c3c8
SHA512 (sudo.sh) = 1378412b39b31f1f76b9d7b9fce5ea679e764a2fd85804fbc3b9ce1c8b5e9b1694be854b4407d1b5dba229763127c9cc64bc09bdf87b384c93536b97d001520d

View File

@ -1,3 +0,0 @@
Test Name: gts-smoketest
Author:
Short Description: Check the metapackage installability

View File

@ -1,10 +0,0 @@
#!/bin/sh
set -e
set -x
# This is a metapackage. It's main purpose is to pull other packages
# into play via the rpm deps.
rpm -q gcc-toolset-14
echo
echo RESULT: PASS

View File

@ -1,10 +0,0 @@
---
- hosts: localhost
roles:
- role: standard-test-basic
tags:
- classic
tests:
- gts-smoketest
required_packages:
- scl-utils