ci: Remove compilers.yaml from the images

We aren't using Spack (heavily) in these images, all we use it for is to install from the buildcache. Spack doesn't need to know about *all* the compilers we installed to do that much. This also fixes an issue regarding the Spack code for OpenSUSE Leap 15, it used to be called `os=opensuse_leap15` but now is `os=opensuse15`. Bisection reveals the difference appeared when the distro vendered dependency was updated in spack/spack#33951 to include python-distro/distro#319. The change in Spack occured in January 2023, years after the change in distro was merged in October 2021, over a year after OpenSUSE Leap 15.2 was released in July 2020. Sigh.
HPCToolkit · Apr 8, 2023 · 2478640 · 2478640
1 parent 2711d58
commit 2478640
Show file tree

Hide file tree

Showing 19 changed files with 0 additions and 511 deletions.
diff --git a/ci/containers/almalinux8-cuda10.2/compilers.yaml b/ci/containers/almalinux8-cuda10.2/compilers.yaml
diff --git a/ci/containers/almalinux8/compilers.yaml b/ci/containers/almalinux8/compilers.yaml
diff --git a/ci/containers/almalinux8/main.inc b/ci/containers/almalinux8/main.inc
@@ -31,15 +31,6 @@ RUN yum install -y epel-release shadow-utils \
 
 # Install the permanent Spack configuration
 COPY config.yaml /etc/spack/
-COPY compilers.yaml /etc/spack/linux/
-RUN \
-  case $TARGETARCH in \
-  amd64) target=x86_64; ;; \
-  arm64) target=aarch64; ;; \
-  ppc64le) target=ppc64le; ;; \
-  *) echo "Invalid TARGETARCH: $TARGETARCH"; exit 1; ;; \
-  esac \
-  && sed -i "s/@TARGET@/$target/g" /etc/spack/linux/compilers.yaml
 
 INCLUDE ../spack.inc
 

diff --git a/ci/containers/fedora36/Containerfile.in b/ci/containers/fedora36/Containerfile.in
@@ -36,14 +36,5 @@ RUN yum update -y \
 
 # Install the permanent Spack configuration
 COPY config.yaml /etc/spack/
-COPY compilers.yaml /etc/spack/linux/
-RUN \
-  case $TARGETARCH in \
-  amd64) target=x86_64; ;; \
-  arm64) target=aarch64; ;; \
-  ppc64le) target=ppc64le; ;; \
-  *) echo "Invalid TARGETARCH: $TARGETARCH"; exit 1; ;; \
-  esac \
-  && sed -i "s/@TARGET@/$target/g" /etc/spack/linux/compilers.yaml
 
 INCLUDE ../spack.inc
diff --git a/ci/containers/fedora36/compilers.yaml b/ci/containers/fedora36/compilers.yaml
diff --git a/ci/containers/leap15/Containerfile.in b/ci/containers/leap15/Containerfile.in
@@ -41,14 +41,5 @@ RUN zypper install -y \
 
 # Install the permanent Spack configuration
 COPY config.yaml /etc/spack/
-COPY compilers.yaml /etc/spack/linux/
-RUN \
-  case $TARGETARCH in \
-  amd64) target=x86_64; ;; \
-  arm64) target=aarch64; ;; \
-  ppc64le) target=ppc64le; ;; \
-  *) echo "Invalid TARGETARCH: $TARGETARCH"; exit 1; ;; \
-  esac \
-  && sed -i "s/@TARGET@/$target/g" /etc/spack/linux/compilers.yaml
 
 INCLUDE ../spack.inc
diff --git a/ci/containers/leap15/compilers.yaml b/ci/containers/leap15/compilers.yaml
diff --git a/ci/containers/ubuntu20.04-cuda11.6.2/compilers.yaml b/ci/containers/ubuntu20.04-cuda11.6.2/compilers.yaml
diff --git a/ci/containers/ubuntu20.04-cuda11.8.0/compilers.yaml b/ci/containers/ubuntu20.04-cuda11.8.0/compilers.yaml
diff --git a/ci/containers/ubuntu20.04-cuda12.0.1/compilers.yaml b/ci/containers/ubuntu20.04-cuda12.0.1/compilers.yaml
diff --git a/ci/containers/ubuntu20.04-lvlz2022.2/compilers.yaml b/ci/containers/ubuntu20.04-lvlz2022.2/compilers.yaml
diff --git a/ci/containers/ubuntu20.04-lvlz2022.3.1/compilers.yaml b/ci/containers/ubuntu20.04-lvlz2022.3.1/compilers.yaml
diff --git a/ci/containers/ubuntu20.04-lvlz2023.0.0/compilers.yaml b/ci/containers/ubuntu20.04-lvlz2023.0.0/compilers.yaml