Jason Bonnell
463126770a
## Motivation <!-- Explain the purpose of this PR and the goals it aims to achieve. --> - __Reduced Code Duplication__: Version parsing logic moved from individual Dockerfiles to the central build script - __Improved Edge Case Handling__: Better handling of ROCm versions with and without patch numbers (e.g., `6.2` vs `6.2.0`) - __Easier Maintenance__: Future version-related changes only need to be made in one place - __Cleaner Dockerfiles__: Simplified Dockerfiles focus on package installation rather than complex shell logic - __Updated Platform Support__: Refreshed container matrix to reflect current platform/ROCm version combinations - __Fix OpenSUSE Docker Generation__: OpenSUSE container generation fails due to a change to the `binutils-gold` package - __Error Handling__: Fix bug where errors in docker image build were being masked, allowing workflow to pass anyway. ## Technical Details <!-- Explain the changes along with any relevant GitHub links. --> - Updated `Dockerfile.opensuse` and `Dockerfile.opensuse.ci` docker files to remove `binutils-gold` - Not needed since we build `binutils` with systems anyways - Updated `rocprofiler-systems-containers.yml` to remove `pushd/popd` commands and just run the shell scripts - There was a silent failure observed here, which I verified in this PR before adding the fix for openSUSE - Refactor ROCm version parsing. Move this logic to the `build-docker.sh` script to reduce duplication. - Fix bug that caused ROCm 7.0 to fail installation. The trailing `.0` was being trimmed. - Fixed inconsistencies in `containers.yml` that lead to invalid ROCm-OS_VERSION combinations. - Formatting fixes - Removed trailing whitespace - Fix docker build warnings. Use an `=` rather than ` ` when assigning an environment variable.
87 строки
1.9 KiB
YAML
87 строки
1.9 KiB
YAML
# Supported OS + ROCm combinations for continuous integration
|
|
|
|
matrix:
|
|
# ubuntu 22.04
|
|
- os-distro: "ubuntu"
|
|
os-version: "22.04"
|
|
rocm-version: "0.0"
|
|
- os-distro: "ubuntu"
|
|
os-version: "22.04"
|
|
rocm-version: "6.3"
|
|
- os-distro: "ubuntu"
|
|
os-version: "22.04"
|
|
rocm-version: "6.4"
|
|
- os-distro: "ubuntu"
|
|
os-version: "22.04"
|
|
rocm-version: "7.0"
|
|
# ubuntu 24.04
|
|
- os-distro: "ubuntu"
|
|
os-version: "24.04"
|
|
rocm-version: "0.0"
|
|
- os-distro: "ubuntu"
|
|
os-version: "24.04"
|
|
rocm-version: "6.3"
|
|
- os-distro: "ubuntu"
|
|
os-version: "24.04"
|
|
rocm-version: "6.4"
|
|
- os-distro: "ubuntu"
|
|
os-version: "24.04"
|
|
rocm-version: "7.0"
|
|
# opensuse 15.5
|
|
- os-distro: "opensuse"
|
|
os-version: "15.5"
|
|
rocm-version: "0.0"
|
|
- os-distro: "opensuse"
|
|
os-version: "15.5"
|
|
rocm-version: "6.3"
|
|
# opensuse 15.6
|
|
- os-distro: "opensuse"
|
|
os-version: "15.6"
|
|
rocm-version: "0.0"
|
|
- os-distro: "opensuse"
|
|
os-version: "15.6"
|
|
rocm-version: "6.3"
|
|
- os-distro: "opensuse"
|
|
os-version: "15.6"
|
|
rocm-version: "6.4"
|
|
# RHEL 8.10
|
|
- os-distro: "rhel"
|
|
os-version: "8.10"
|
|
rocm-version: "0.0"
|
|
- os-distro: "rhel"
|
|
os-version: "8.10"
|
|
rocm-version: "6.3"
|
|
- os-distro: "rhel"
|
|
os-version: "8.10"
|
|
rocm-version: "6.4"
|
|
- os-distro: "rhel"
|
|
os-version: "8.10"
|
|
rocm-version: "7.0"
|
|
# RHEL 9.4
|
|
- os-distro: "rhel"
|
|
os-version: "9.4"
|
|
rocm-version: "0.0"
|
|
- os-distro: "rhel"
|
|
os-version: "9.4"
|
|
rocm-version: "6.3"
|
|
- os-distro: "rhel"
|
|
os-version: "9.4"
|
|
rocm-version: "6.4"
|
|
- os-distro: "rhel"
|
|
os-version: "9.4"
|
|
rocm-version: "7.0"
|
|
# RHEL 9.5
|
|
- os-distro: "rhel"
|
|
os-version: "9.5"
|
|
rocm-version: "0.0"
|
|
- os-distro: "rhel"
|
|
os-version: "9.5"
|
|
rocm-version: "6.3"
|
|
- os-distro: "rhel"
|
|
os-version: "9.5"
|
|
rocm-version: "6.4"
|
|
# RHEL 9.6
|
|
- os-distro: "rhel"
|
|
os-version: "9.6"
|
|
rocm-version: "7.0"
|