From 959e1e8fd5235d0ef5778a84eb6d16edf7f8d6d3 Mon Sep 17 00:00:00 2001 From: Dmitri Smirnov Date: Wed, 27 Sep 2023 22:54:14 -0400 Subject: [PATCH] feat: upgrade environment to star-spack@0.3.0 --- Dockerfile | 2 +- mgr/config/v0.3.0-rhel7-root5.34.38.config | 16 ++++++++++++++++ mgr/config/v0.3.0-rhel7-root6.16.00.config | 16 ++++++++++++++++ mgr/config/v0.3.0-rhel7-root6.24.06.config | 16 ++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 mgr/config/v0.3.0-rhel7-root5.34.38.config create mode 100644 mgr/config/v0.3.0-rhel7-root6.16.00.config create mode 100644 mgr/config/v0.3.0-rhel7-root6.24.06.config diff --git a/Dockerfile b/Dockerfile index 481b63d2407..5552ecb917b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG starenv=root5 # Pick one from [gcc485, gcc11] ARG compiler=gcc485 -FROM ghcr.io/star-bnl/star-spack:v0.2.3-${starenv}-${compiler} +FROM ghcr.io/star-bnl/star-spack:v0.3.0-${starenv}-${compiler} ARG compiler diff --git a/mgr/config/v0.3.0-rhel7-root5.34.38.config b/mgr/config/v0.3.0-rhel7-root5.34.38.config new file mode 100644 index 00000000000..bfb649b306d --- /dev/null +++ b/mgr/config/v0.3.0-rhel7-root5.34.38.config @@ -0,0 +1,16 @@ +#!/usr/bin/env csh + +# this is in place of buggy `module clear` (module VERSION=3.2.10 DATE=2012-12-21) +unsetenv _LMFILES_* + +if ( $USE_64BITS == 1 ) then + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ +else + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ +endif + +module load star-env-0.3.0-root-5.34.38 diff --git a/mgr/config/v0.3.0-rhel7-root6.16.00.config b/mgr/config/v0.3.0-rhel7-root6.16.00.config new file mode 100644 index 00000000000..b33b1856c90 --- /dev/null +++ b/mgr/config/v0.3.0-rhel7-root6.16.00.config @@ -0,0 +1,16 @@ +#!/usr/bin/env csh + +# this is in place of buggy `module clear` (module VERSION=3.2.10 DATE=2012-12-21) +unsetenv _LMFILES_* + +if ( $USE_64BITS == 1 ) then + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ +else + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ +endif + +module load star-env-0.3.0-root-6.16.00 diff --git a/mgr/config/v0.3.0-rhel7-root6.24.06.config b/mgr/config/v0.3.0-rhel7-root6.24.06.config new file mode 100644 index 00000000000..80efe1ef9cb --- /dev/null +++ b/mgr/config/v0.3.0-rhel7-root6.24.06.config @@ -0,0 +1,16 @@ +#!/usr/bin/env csh + +# this is in place of buggy `module clear` (module VERSION=3.2.10 DATE=2012-12-21) +unsetenv _LMFILES_* + +if ( $USE_64BITS == 1 ) then + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ +else + module purge + module unuse /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86_64/ + module use /cvmfs/star.sdcc.bnl.gov/star-spack/spack/share/spack/modules/linux-rhel7-x86/ +endif + +module load star-env-0.3.0-root-6.24.06