From e08591d65afad109ccccbc216185287981c29731 Mon Sep 17 00:00:00 2001 From: "Jonathan R. Madsen" Date: Sun, 15 Jan 2023 19:07:43 -0600 Subject: [PATCH] Fix OpenSUSE ROCm install for CPack workflow (#226) - updates perl repo URL --- docker/Dockerfile.opensuse | 3 ++- docker/build-docker.sh | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.opensuse b/docker/Dockerfile.opensuse index 1fb5a143d2..9bc9c29eab 100644 --- a/docker/Dockerfile.opensuse +++ b/docker/Dockerfile.opensuse @@ -20,9 +20,10 @@ RUN zypper update -y && \ ARG ROCM_VERSION=0.0 ARG AMDGPU_RPM=latest/sle/15/amdgpu-install-21.50.50000-1.noarch.rpm -# ARG AMDGPU_RPM=21.40.2/sle/15/amdgpu-install-21.40.2.40502-1.noarch.rpm +ARG PERL_REPO=SLE_15 RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \ + zypper addrepo https://mirrorcache-us.opensuse.org/repositories/devel:/languages:/perl/${PERL_REPO}/devel:languages:perl.repo && \ zypper --no-gpg-checks install -y https://repo.radeon.com/amdgpu-install/${AMDGPU_RPM} && \ zypper --non-interactive --gpg-auto-import-keys refresh && \ amdgpu-install --usecase=rocm,hip,hiplibsdk --no-dkms -y && \ diff --git a/docker/build-docker.sh b/docker/build-docker.sh index 52a8d32bb4..8ba48b4fe2 100755 --- a/docker/build-docker.sh +++ b/docker/build-docker.sh @@ -143,6 +143,9 @@ if [ ! -f ${DOCKER_FILE} ]; then send-error "File \"${DOCKER_FILE}\" not found"; for VERSION in ${VERSIONS} do + VERSION_MAJOR=$(echo ${VERSION} | sed 's/\./ /g' | awk '{print $1}') + VERSION_MINOR=$(echo ${VERSION} | sed 's/\./ /g' | awk '{print $2}') + VERSION_PATCH=$(echo ${VERSION} | sed 's/\./ /g' | awk '{print $3}') for ROCM_VERSION in ${ROCM_VERSIONS} do CONTAINER=${USER}/omnitrace:release-base-${DISTRO}-${VERSION}-rocm-${ROCM_VERSION} @@ -257,7 +260,8 @@ do send-error "Unsupported combination :: ${DISTRO}-${VERSION} + ROCm ${ROCM_VERSION}" ;; esac - verbose-build docker build . -f ${DOCKER_FILE} --tag ${CONTAINER} --build-arg DISTRO=${DISTRO_IMAGE} --build-arg VERSION=${VERSION} --build-arg ROCM_VERSION=${ROCM_VERSION} --build-arg AMDGPU_RPM=${ROCM_RPM} --build-arg PYTHON_VERSIONS=\"${PYTHON_VERSIONS}\" + PERL_REPO="SLE_${VERSION_MAJOR}_SP${VERSION_MINOR}" + verbose-build docker build . -f ${DOCKER_FILE} --tag ${CONTAINER} --build-arg DISTRO=${DISTRO_IMAGE} --build-arg VERSION=${VERSION} --build-arg ROCM_VERSION=${ROCM_VERSION} --build-arg AMDGPU_RPM=${ROCM_RPM} --build-arg PERL_REPO=${PERL_REPO} --build-arg PYTHON_VERSIONS=\"${PYTHON_VERSIONS}\" fi if [ "${PUSH}" -ne 0 ]; then docker push ${CONTAINER}