Skip to content

ROX-31971: update ubi and centos base images to 10 #2692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 27, 2025
Merged

ROX-31971: update ubi and centos base images to 10 #2692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b39913f
Bump centos and ubi versions to 10
ovalenti Nov 26, 2025
ec5cbcf
Update tbb to include a warning fix
ovalenti Nov 26, 2025
f47832f
Keep curl as it is needed for status-check.sh
ovalenti Nov 26, 2025
48c970b
gcovr somehow depends on gpg
ovalenti Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:

- name: Generate coverage report
run: |
dnf install -y python-pip
dnf install -y python-pip gpg
Copy link
Contributor

@erthalion erthalion Nov 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need gpg?

Copy link
Contributor Author

@ovalenti ovalenti Nov 27, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first CI run in this PR had the codecov step failing with the message :

Error: The following required dependencies are missing: gpg
Please install these dependencies before using this action.

I suppose that gpg was available by default in stream9 ?

pip install gcovr
gcovr \
--xml /tmp/xml-report/ \
Expand Down
2 changes: 1 addition & 1 deletion builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/centos/centos:stream9
FROM quay.io/centos/centos:stream10

ARG BUILD_DIR=/install-tmp
ARG COLLECTOR_BUILDER_DEBUG
Expand Down
2 changes: 1 addition & 1 deletion builder/third_party/tbb
Open in desktop
Submodule tbb updated from 0c0ff1 to 0cd32a
2 changes: 1 addition & 1 deletion collector/container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
FROM registry.access.redhat.com/ubi10/ubi-minimal:latest

ARG BUILD_TYPE=rhel
ARG ROOT_DIR=.
Expand Down
3 changes: 1 addition & 2 deletions collector/container/rhel/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
#!/usr/bin/env bash
set -eo pipefail

# UBI 9 requires confirmation with -y flag.
microdnf upgrade -y --nobest
microdnf install -y elfutils-libelf

microdnf clean all
# shellcheck disable=SC2046
rpm --verbose -e --nodeps $(
rpm -qa 'curl' '*rpm*' '*dnf*' '*libsolv*' '*hawkey*' 'yum*' 'libyaml*' 'libarchive*'
rpm -qa '*rpm*' '*dnf*' '*libsolv*' '*hawkey*' 'yum*' 'libyaml*' 'libarchive*'
)
rm -rf /var/cache/yum
Loading