Update container files

ROCm · Oct 18, 2024 · 3dcad22 · 3dcad22
1 parent 24049fe
commit 3dcad22
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
@@ -7,7 +7,7 @@ on:
   schedule:
     - cron: 0 5 * * *
   push:
-    branches: [main, amd-mainline]
+    branches: [amd-staging, amd-mainline]
     paths:
       - '.github/workflows/containers.yml'
       - 'docker/**'

diff --git a/docker/Dockerfile.opensuse b/docker/Dockerfile.opensuse
@@ -26,7 +26,7 @@ RUN zypper --non-interactive update -y && \
     zypper --non-interactive install -y binutils-gold cmake curl dpkg-devel gcc-c++ git libnuma-devel openmpi3-devel python3-pip rpm-build wget && \
 
 ARG ROCM_VERSION=0.0
-ARG AMDGPU_RPM=latest/sle/15/amdgpu-install-21.50.50000-1.noarch.rpm
+ARG AMDGPU_RPM=6.2/sle/15.6/amdgpu-install-6.2.60200-1.noarch.rpm
 ARG PERL_REPO=SLE_15
 
 RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \

diff --git a/docker/Dockerfile.opensuse.ci b/docker/Dockerfile.opensuse.ci
@@ -15,7 +15,7 @@ ENV PATH /usr/local/bin:${PATH}
 ARG EXTRA_PACKAGES=""
 ARG ELFUTILS_DOWNLOAD_VERSION="0.188"
 ARG BOOST_DOWNLOAD_VERSION="1.79.0"
-ARG NJOBS="12"
+ARG NJOBS="8"
 
 RUN set +e; \
     zypper --non-interactive -i --gpg-auto-import-keys refresh; \

diff --git a/docker/Dockerfile.rhel b/docker/Dockerfile.rhel
@@ -19,7 +19,7 @@ RUN yum groupinstall -y "Development Tools" && \
     yum clean all
 
 ARG ROCM_VERSION=0.0
-ARG AMDGPU_RPM=5.4/rhel/8.7/amdgpu-install-5.4.50400-1.el8.noarch.rpm
+ARG AMDGPU_RPM=6.2/rhel/9.4/amdgpu-install-6.2.60202-1.el9.noarch.rpm
 
 RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \
         OS_VERSION_MAJOR=$(cat /etc/os-release | grep 'VERSION_ID' | sed 's/=/ /1' | awk '{print $NF}' | sed 's/"//g' | sed 's/\./ /g' | awk '{print $1}') && \

diff --git a/docker/Dockerfile.rhel.ci b/docker/Dockerfile.rhel.ci
@@ -15,7 +15,7 @@ ENV PATH /usr/local/bin:${PATH}
 ARG EXTRA_PACKAGES=""
 ARG ELFUTILS_DOWNLOAD_VERSION="0.188"
 ARG BOOST_DOWNLOAD_VERSION="1.79.0"
-ARG NJOBS="12"
+ARG NJOBS="8"
 
 RUN yum groupinstall -y "Development Tools" && \
     yum install -y epel-release && crb enable && \

diff --git a/docker/Dockerfile.ubuntu.ci b/docker/Dockerfile.ubuntu.ci
@@ -15,7 +15,7 @@ SHELL [ "/bin/bash", "-c" ]
 ARG EXTRA_PACKAGES=""
 ARG ELFUTILS_DOWNLOAD_VERSION="0.188"
 ARG BOOST_DOWNLOAD_VERSION="1.79.0"
-ARG NJOBS="12"
+ARG NJOBS="8"
 
 
 ENV PATH /usr/local/bin:${PATH}

diff --git a/docker/build-docker-ci.sh b/docker/build-docker-ci.sh
@@ -6,7 +6,7 @@ set -e
 : ${DISTRO:=ubuntu}
 : ${VERSIONS:=20.04}
 : ${NJOBS=$(nproc)}
-: ${ELFUTILS_VERSION:=0.188}
+: ${ELFUTILS_VERSION:=0.186}
 : ${BOOST_VERSION:=1.79.0}
 : ${PYTHON_VERSIONS:="6 7 8 9 10 11 12"}
 : ${PUSH:=0}
@@ -42,7 +42,7 @@ usage()
     print_default_option versions "[VERSION] [VERSION...]" "Ubuntu, OpenSUSE, or RHEL release" "${VERSIONS}"
     print_default_option python-versions "[VERSION] [VERSION...]" "Python 3 minor releases" "${PYTHON_VERSIONS}"
     print_default_option "jobs -j" "[N]" "parallel build jobs" "${NJOBS}"
-    print_default_option elfutils-version "[0.183..0.186]" "ElfUtils version" "${ELFUTILS_VERSION}"
+    print_default_option elfutils-version "[0.183..0.188]" "ElfUtils version" "${ELFUTILS_VERSION}"
     print_default_option boost-version "[1.67.0..1.79.0]" "Boost version" "${BOOST_VERSION}"
     print_default_option user "[USERNAME]" "DockerHub username" "${USER}"
 }