Another batch of CentOS related fixes

This commit is contained in:
Václav Kadlčík 2025-05-19 14:27:58 +02:00
commit 7d1b14d1b6
60 changed files with 99 additions and 163 deletions

View file

@ -35,7 +35,7 @@ framework: beakerlib
require+:
- gcc
- libgcj
recommend:
recommend+:
- java-1.4.2-gcj-compat
- java-1.4.2-gcj-compat-devel
- java-1.5.0-gcj

View file

@ -44,7 +44,7 @@ framework: beakerlib
require+:
- gcc
- glibc-devel
recommend:
recommend+:
- glibc-devel.i686
- glibc-devel.x86_64
- libgcc.i686

View file

@ -28,7 +28,7 @@ framework: beakerlib
require+:
- gcc
- rpm-build
recommend:
recommend+:
- dnf-utils
- yum-utils
duration: 60m

View file

@ -28,7 +28,7 @@ framework: beakerlib
require+:
- gcc
- rpm-build
recommend:
recommend+:
- dnf-utils
- yum-utils
duration: 60m

View file

@ -17,7 +17,7 @@ adjust+:
contact: Vaclav Kadlcik <vkadlcik@redhat.com>
component:
- gcc
recommend:
recommend+:
- binutils
test: ${WITH_SCL:-bash} ./runtest.sh
framework: beakerlib

View file

@ -14,7 +14,7 @@ require+:
- gcc
- gcc-c++
- gdb
recommend:
recommend+:
- python
- python3
- python2

View file

@ -33,7 +33,7 @@ framework: beakerlib
require+:
- gcc
- binutils
recommend:
recommend+:
- libgcc.i686
- libgcc.x86_64
- libgcc.ppc

View file

@ -19,7 +19,7 @@ test: ${WITH_SCL:-bash} ./runtest.sh
framework: beakerlib
require+:
- gcc
recommend:
recommend+:
- libitm
- libitm-devel
- gcc-libraries

View file

@ -34,7 +34,7 @@ test: ${WITH_SCL:-bash} ./runtest.sh
framework: beakerlib
require+:
- gcc
recommend:
recommend+:
- libasan
- libasan.x86_64
- libasan.i686

View file

@ -25,7 +25,7 @@ require+:
- perl
- binutils
- libgcc
recommend:
recommend+:
- libgcc.x86_64
- libgcc.i686
adjust+:

View file

@ -40,7 +40,7 @@ test: ${WITH_SCL:-bash} ./runtest.sh
framework: beakerlib
require+:
- gcc-c++
recommend:
recommend+:
- libtsan
- libtsan2
- libtsan-devel

View file

@ -29,6 +29,9 @@ adjust+:
- enabled: false
when: arch == s390x and collection is not defined and distro <= rhel-9
continue: false
- enabled: false
when: arch == s390x and collection is not defined and distro <= centos-stream-9
continue: false
contact: Vaclav Kadlcik <vkadlcik@redhat.com>
component:
- gcc
@ -36,7 +39,7 @@ test: ${WITH_SCL:-bash} ./runtest.sh
framework: beakerlib
require+:
- gcc
recommend:
recommend+:
- libtsan
- libtsan-devel
- libtsan-static

View file

@ -24,7 +24,7 @@ test: ${WITH_SCL:-bash} ./runtest.sh
framework: beakerlib
require+:
- gcc
recommend:
recommend+:
- libasan
- libasan.x86_64
- libasan.i686

View file

@ -24,6 +24,9 @@ adjust+:
- enabled: false
when: arch == s390x and collection is not defined and distro <= rhel-9
continue: false
- enabled: false
when: arch == s390x and collection is not defined and distro <= centos-stream-9
continue: false
contact: Vaclav Kadlcik <vkadlcik@redhat.com>
component:
- gcc
@ -32,7 +35,7 @@ framework: beakerlib
require+:
- gcc
- gcc-c++
recommend:
recommend+:
- liblsan
- liblsan-devel
- liblsan-static

View file

@ -22,7 +22,7 @@ framework: beakerlib
require+:
- gcc
- libasan
recommend:
recommend+:
- libasan.x86_64
- libasan.i686
duration: 5m

View file

@ -20,7 +20,7 @@ tag:
tier: '1'
require+:
- gcc
recommend:
recommend+:
- libitm-devel
duration: 15m
extra-nitrate: TC#0611050

View file

@ -33,7 +33,7 @@ require+:
- gcc-c++
- cpio
- elfutils
recommend:
recommend+:
- koji
- centpkg
- annocheck

View file

@ -16,6 +16,9 @@ adjust+:
- enabled: false
when: arch == s390x and collection is not defined and distro <= rhel-9
continue: false
- enabled: false
when: arch == s390x and collection is not defined and distro <= centos-stream-9
continue: false
contact: Vaclav Kadlcik <vkadlcik@redhat.com>
component:
- gcc
@ -23,7 +26,7 @@ test: ${WITH_SCL:-bash} ./runtest.sh
framework: beakerlib
require+:
- gcc
recommend:
recommend+:
- libtsan
- libtsan-devel
- libtsan-static

View file

@ -1,25 +0,0 @@
summary: Do not depend on older collections
description: |
Bug summary: please drop/update dependency on gcc-toolset-11-binutils
Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=2091571
enabled: true
link:
- relates: https://bugzilla.redhat.com/show_bug.cgi?id=2091571
tag:
- NoRHIVOS
- CI-Tier-1
tier: '1'
adjust+:
- enabled: false
when: collection is not defined
continue: false
contact: Vaclav Kadlcik <vkadlcik@redhat.com>
component:
- gcc
test: ${WITH_SCL:-bash} ./runtest.sh
framework: beakerlib
require+:
- gcc
duration: 60m
extra-summary: /tools/gcc/Regression/bz2091571-please-drop-update-dependency-on
extra-task: /tools/gcc/Regression/bz2091571-please-drop-update-dependency-on

View file

@ -1,83 +0,0 @@
#!/usr/bin/env bash
# Load libraries
. /usr/share/beakerlib/beakerlib.sh || exit 1
. "${0%/*}"/../../lib/common.sh || exit 1
# Relevant for Collection GCCs only
GCC="${GCC:-$(type -P gcc)}"
GCC_RPM_NAME=$(rpm --qf '%{name}' -qf "$GCC")
PACKAGES="$GCC_RPM_NAME"
rlJournalStart
rlPhaseStartSetup
rlMountRedhat
rlRun "pkgmgr_install --skip-broken $PACKAGES" 0-255 # best effort
rlLogInfo "PACKAGES=$PACKAGES"
rlLogInfo "COLLECTIONS=$COLLECTIONS"
rlLogInfo "GCC=$GCC"
rlLogInfo "SKIP_COLLECTION_METAPACKAGE_CHECK=$SKIP_COLLECTION_METAPACKAGE_CHECK"
# We optionally need to skip checking for the presence of the metapackage
# because that would pull in all the dependent toolset subrpms. We do not
# always want that, especially in CI.
_COLLECTIONS="$COLLECTIONS"
if ! test -z "$SKIP_COLLECTION_METAPACKAGE_CHECK"; then
for c in $SKIP_COLLECTION_METAPACKAGE_CHECK; do
rlLogInfo "ignoring metapackage check for collection $c"
COLLECTIONS=$(shopt -s extglob && echo "${COLLECTIONS//$c/}"); export COLLECTIONS
done
fi
rlLogInfo "(without skipped) COLLECTIONS=$COLLECTIONS"
rlAssertRpm --all
export COLLECTIONS="$_COLLECTIONS"
rlRun "OUR_NVR_SLASHED=$(rpm -q --qf='%{NAME}/%{VERSION}/%{RELEASE}' "$GCC_RPM_NAME")"
rlRun "RPMS_DIR=/mnt/redhat/brewroot/packages/$OUR_NVR_SLASHED"
rlRun "ONLY_ACCEPTED_COLLECTION=${GCC_RPM_NAME%-gcc}"
rlRun "TmpDir=\$(mktemp -d)"
# shellcheck disable=SC2154
rlRun "pushd $TmpDir"
rlPhaseEnd
rlPhaseStartTest
rlRun "ARCH=$(rlGetPrimaryArch)"
rlAssertExists "$RPMS_DIR/$ARCH"
for a in "$ARCH" $(rlGetSecondaryArch) noarch; do
[[ -e "$RPMS_DIR/$a" ]] || continue # rlGetSecondaryArch and noarch may not exist
rlRun "/bin/ls $RPMS_DIR/$a/*.rpm >rpms.txt"
while read -r i; do
just_basename=${i##*/}
just_basename=${just_basename%.rpm}
rlRun "rpm -q --requires -p $i >$just_basename"
while read -r req; do
if [[ "$req" == *${ONLY_ACCEPTED_COLLECTION}* ]]; then
continue # This is OK, deps on "our" collection are expected
fi
if [[ "$req" == *devtoolset-* ]] || [[ "$req" == *gcc-toolset-* ]]; then
rlFail "$just_basename depends on an unexpected collection package: $req"
fi
done <"$just_basename"
done <rpms.txt
done
rlPhaseEnd
rlPhaseStartCleanup
rlRun "popd"
rlRun "rm -r $TmpDir"
rlPhaseEnd
rlJournalPrintText
rlJournalEnd

View file

@ -28,6 +28,11 @@ adjust+:
when: collection is defined and distro > rhel-7 and arch != x86_64 and arch !=
ppc64le
continue: false
- because: no libquadmath
enabled: false
when: collection is defined and distro > centos-stream-7 and arch != x86_64 and arch !=
ppc64le
continue: false
contact: Vaclav Kadlcik <vkadlcik@redhat.com>
component:
- gcc
@ -36,7 +41,7 @@ framework: beakerlib
require+:
- gcc
- gcc-gfortran
recommend:
recommend+:
- libquadmath-static
- libgfortran-static
duration: 20m

View file

@ -22,7 +22,7 @@ framework: beakerlib
require+:
- gcc
- rpm-build
recommend:
recommend+:
- dnf-utils
- yum-utils
duration: 60m

View file

@ -28,7 +28,7 @@ framework: beakerlib
require+:
- gcc
- rpm-build
recommend:
recommend+:
- dnf-utils
- yum-utils
duration: 60m

View file

@ -25,7 +25,7 @@ require+:
- systemtap-sdt-devel
- kernel-devel
- kernel-headers
recommend:
recommend+:
- dyninst
- systemtap-testsuite
- libstdc++-devel.i686

View file

@ -17,7 +17,7 @@ require+:
- gcc
- libatomic
- libitm
recommend:
recommend+:
- libasan
- libasan.i686
- libasan.x86_64

View file

@ -25,7 +25,7 @@ framework: beakerlib
require+:
- gcc
- binutils
recommend:
recommend+:
- libitm.x86_64
- libitm.i686
duration: 30m

View file

@ -11,11 +11,11 @@ PACKAGE="gcc"
rlJournalStart
rlPhaseStartSetup
rlAssertRpm "$PACKAGE"
if rlIsRHEL '<9'; then
if rlIsRHEL '<9' || rlIsCentOS '<9'; then
# RHBZ#1213268
POWER_TO_COMPILE_FOR=power8
POWER_TO_OPTIMIZE_TO=power8
elif rlIsRHEL 9; then
elif rlIsRHEL 9 || rlIsCentOS 9; then
# RHBZ#1870028; related: RHBZ#1876584, RHBZ#1876436
POWER_TO_COMPILE_FOR=power9
POWER_TO_OPTIMIZE_TO=power9

View file

@ -12,7 +12,7 @@ require+:
- gcc-c++
- glibc-devel
- libstdc++-devel
recommend:
recommend+:
- gcc44-c++
- glibc-devel.ppc64
- glibc-devel.ppc

View file

@ -14,7 +14,7 @@ require+:
- gcc
- rpm-build
- dejagnu
recommend:
recommend+:
- dnf-utils
- yum-utils
duration: 30m

View file

@ -17,6 +17,9 @@ adjust+:
- enabled: false
when: distro < rhel-10
continue: false
- enabled: false
when: distro < centos-stream-10
continue: false
- enabled: false
when: arch != ppc64le
continue: false

View file

@ -17,6 +17,9 @@ adjust+:
- enabled: false
when: distro < rhel-10
continue: false
- enabled: false
when: distro < centos-stream-10
continue: false
- enabled: false
when: arch != ppc64le
continue: false

View file

@ -8,7 +8,7 @@ tier: '1'
contact: Vaclav Kadlcik <vkadlcik@redhat.com>
component:
- gcc
recommend:
recommend+:
- gcc-plugin-annobin
test: ${WITH_SCL:-bash} ./runtest.sh
adjust+:

View file

@ -27,7 +27,7 @@ require+:
- annobin-annocheck
- redhat-rpm-config
- gcc-c++
recommend:
recommend+:
- annobin
- annobin-plugin-gcc
adjust+:

View file

@ -15,7 +15,7 @@ require+:
- libquadmath-devel
- openmpi-devel
- python3-devel
recommend:
recommend+:
- wget
- wget2
adjust+:

View file

@ -15,7 +15,7 @@ adjust+:
contact: Vaclav Kadlcik <vkadlcik@redhat.com>
component:
- gcc
recommend:
recommend+:
- gdb
tier: '3'
test: ${WITH_SCL:-bash} ./runtest.sh

View file

@ -35,7 +35,7 @@ require+:
- texinfo
- xz-devel
- zlib-devel
recommend:
recommend+:
- ncurses-devel
- python-devel
- python3-devel

View file

@ -10,7 +10,7 @@ require+:
- gcc
- gcc-c++
- annobin-annocheck
recommend:
recommend+:
- annobin-plugin-gcc
- annobin
duration: 30m

View file

@ -10,6 +10,9 @@ adjust+:
- enabled: false
when: collection is not defined and distro < rhel-10
continue: false
- enabled: false
when: collection is not defined and distro < centos-stream-10
continue: false
- enabled: false
when: collection == gcc-toolset-13
continue: false

View file

@ -29,7 +29,7 @@ test: ${WITH_SCL:-bash} ./runtest.sh
framework: beakerlib
require+:
- gcc
recommend:
recommend+:
- libasan
- libasan.x86_64
- libasan.i686

View file

@ -9,7 +9,7 @@ framework: beakerlib
require+:
- gcc
- gcc-c++
recommend:
recommend+:
- libgomp
- libgomp.i686
- libgomp.x86_64

View file

@ -36,7 +36,7 @@ test: ${WITH_SCL:-bash} ./runtest.sh
framework: beakerlib
require+:
- gcc
recommend:
recommend+:
- libhwasan
duration: 10m
extra-nitrate: TC#0617548

View file

@ -21,6 +21,10 @@ adjust+:
when: arch == s390x and collection is not defined and distro <= rhel-10
continue: false
because: RHEL-40240
- enabled: false
when: arch == s390x and collection is not defined and distro <= centos-stream-10
continue: false
because: RHEL-40240
contact: Vaclav Kadlcik <vkadlcik@redhat.com>
component:
- gcc
@ -28,7 +32,7 @@ test: ${WITH_SCL:-bash} ./runtest.sh
framework: beakerlib
require+:
- gcc
recommend:
recommend+:
- liblsan
- liblsan.x86_64
- liblsan.i686

View file

@ -16,6 +16,9 @@ adjust+:
- enabled: false
when: distro < rhel-10 and collection is not defined and arch == s390x
continue: false
- enabled: false
when: distro < centos-stream-10 and collection is not defined and arch == s390x
continue: false
contact: Vaclav Kadlcik <vkadlcik@redhat.com>
component:
- gcc
@ -23,7 +26,7 @@ test: ${WITH_SCL:-bash} ./runtest.sh
framework: beakerlib
require+:
- gcc
recommend:
recommend+:
- libtsan
duration: 10m
extra-nitrate: TC#0617546

View file

@ -17,7 +17,7 @@ test: ${WITH_SCL:-bash} ./runtest.sh
framework: beakerlib
require+:
- gcc
recommend:
recommend+:
- libubsan
- libubsan.x86_64
- libubsan.i686

View file

@ -37,7 +37,7 @@ require+:
- sharutils
- texinfo
- zlib-devel
recommend:
recommend+:
- dnf-utils
- yum-utils
- scl-utils-build

View file

@ -45,7 +45,7 @@ require+:
- valgrind
- redhat-rpm-config
- elfutils
recommend:
recommend+:
- glibc-devel.i686
- glibc-devel.x86_64
- glibc-devel.ppc

View file

@ -38,7 +38,7 @@ require+:
- sqlite-devel
- systemtap
- xmlto
recommend:
recommend+:
- emacs
- dyninst-devel
- gtkmm24-devel

View file

@ -36,7 +36,7 @@ require+:
- elfutils
- elfutils-libelf-devel
- /usr/bin/python3
recommend:
recommend+:
- dnf-utils
- yum-utils
duration: 3h

View file

@ -15,7 +15,7 @@ require+:
- rpm-build
- dejagnu
- xz
recommend:
recommend+:
- dnf-utils
- yum-utils
- libatomic

View file

@ -16,7 +16,7 @@ require+:
- dejagnu
- xz
- perf
recommend:
recommend+:
- dnf-utils
- yum-utils
- libatomic

View file

@ -15,7 +15,7 @@ require+:
- rpm-build
- dejagnu
- xz
recommend:
recommend+:
- dnf-utils
- yum-utils
- libatomic

View file

@ -16,7 +16,7 @@ require+:
- gdb
- dejagnu
- xz
recommend:
recommend+:
- dnf-utils
- yum-utils
- libatomic

View file

@ -15,7 +15,7 @@ require+:
- rpm-build
- dejagnu
- xz
recommend:
recommend+:
- dnf-utils
- yum-utils
- libatomic

View file

@ -19,7 +19,7 @@ require+:
- kernel-devel
- curl
- jq
recommend:
recommend+:
- dnf-utils
- yum-utils
- libatomic

View file

@ -15,7 +15,7 @@ require+:
- rpm-build
- dejagnu
- xz
recommend:
recommend+:
- dnf-utils
- yum-utils
- libatomic

View file

@ -15,7 +15,7 @@ require+:
- rpm-build
- dejagnu
- xz
recommend:
recommend+:
- dnf-utils
- yum-utils
- libatomic

View file

@ -30,7 +30,7 @@ require+:
- wget
- make
- bison
recommend:
recommend+:
- python3
- python2
- python

View file

@ -13,7 +13,7 @@ require+:
- rpm-build
- dejagnu
- xz
recommend:
recommend+:
- dnf-utils
- yum-utils
- glibc-devel.i686

View file

@ -25,7 +25,7 @@ require+:
- pixman-devel
- python3
- zlib-devel
recommend:
recommend+:
- python
- wget
- wget2-wget

View file

@ -86,6 +86,8 @@ adjust:
- devtoolset-13-annobin-plugin-gcc
- devtoolset-13-annobin-annocheck
- devtoolset-13-gdb
recommend+:
- gcc-toolset-13-offload-nvptx
- when: collection == gcc-toolset-14
require+:
- gcc-toolset-14
@ -106,6 +108,8 @@ adjust:
- gcc-toolset-14-libubsan-devel
- gcc-toolset-14-annobin-plugin-gcc
- gcc-toolset-14-annobin-annocheck
recommend+:
- gcc-toolset-14-offload-nvptx
- when: collection == gcc-toolset-14 and distro == rhel-8 and distro ~> rhel-8.6
require+:
- gcc-toolset-14-gdb
@ -132,6 +136,8 @@ adjust:
- gcc-toolset-15-libubsan-devel
- gcc-toolset-15-annobin-plugin-gcc
- gcc-toolset-15-annobin-annocheck
recommend+:
- gcc-toolset-15-offload-nvptx
- when: collection == gcc-toolset-15 and distro < rhel-9
require+:
- gcc-toolset-15-gdb
@ -155,6 +161,8 @@ adjust:
- gcc-toolset-16-libubsan-devel
- gcc-toolset-16-annobin-plugin-gcc
- gcc-toolset-16-annobin-annocheck
recommend+:
- gcc-toolset-16-offload-nvptx
- when: collection == gcc-toolset-16 and distro < rhel-9
require+:
- gcc-toolset-16-gdb
@ -178,6 +186,8 @@ adjust:
- gcc-toolset-17-libubsan-devel
- gcc-toolset-17-annobin-plugin-gcc
- gcc-toolset-17-annobin-annocheck
recommend+:
- gcc-toolset-17-offload-nvptx
- when: collection == gcc-toolset-17 and distro < rhel-9
require+:
- gcc-toolset-17-gdb
@ -201,6 +211,8 @@ adjust:
- gcc-toolset-18-libubsan-devel
- gcc-toolset-18-annobin-plugin-gcc
- gcc-toolset-18-annobin-annocheck
recommend+:
- gcc-toolset-18-offload-nvptx
- when: collection == gcc-toolset-18 and distro < rhel-9
require+:
- gcc-toolset-18-gdb
@ -224,6 +236,8 @@ adjust:
- gcc-toolset-19-libubsan-devel
- gcc-toolset-19-annobin-plugin-gcc
- gcc-toolset-19-annobin-annocheck
recommend+:
- gcc-toolset-19-offload-nvptx
- when: collection == gcc-toolset-19 and distro < rhel-9
require+:
- gcc-toolset-19-gdb