diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index d13562ff21..5a8a060d7b 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -47,7 +47,7 @@ jobs: - name: Generate coverage report run: | - dnf install -y python-pip + dnf install -y python-pip gpg pip install gcovr gcovr \ --xml /tmp/xml-report/ \ diff --git a/builder/Dockerfile b/builder/Dockerfile index 88e25dfd66..85dc05ef30 100644 --- a/builder/Dockerfile +++ b/builder/Dockerfile @@ -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 diff --git a/builder/third_party/tbb b/builder/third_party/tbb index 0c0ff192a2..0cd32ab10a 160000 --- a/builder/third_party/tbb +++ b/builder/third_party/tbb @@ -1 +1 @@ -Subproject commit 0c0ff192a2304e114bc9e6557582dfba101360ff +Subproject commit 0cd32ab10a84eabf780bb699b17430deb028c0a4 diff --git a/collector/container/Dockerfile b/collector/container/Dockerfile index 0b4ef1b86b..569d67cbb2 100644 --- a/collector/container/Dockerfile +++ b/collector/container/Dockerfile @@ -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=. diff --git a/collector/container/rhel/install.sh b/collector/container/rhel/install.sh index 495a6bb7ce..ee1d0820d4 100755 --- a/collector/container/rhel/install.sh +++ b/collector/container/rhel/install.sh @@ -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