From 9d92cd6cff53449b2795ebe06dc50d7a62be35df Mon Sep 17 00:00:00 2001 From: Dmitri Smirnov Date: Fri, 29 Sep 2023 16:26:36 -0400 Subject: [PATCH] Revert "feat: upgrade environment to star-spack@0.3.0 (#588)" This reverts commit 3714f3db3a7d88e7632e9a38dd9d14cca793b9d9. --- 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, 1 insertion(+), 49 deletions(-) delete mode 100644 mgr/config/v0.3.0-rhel7-root5.34.38.config delete mode 100644 mgr/config/v0.3.0-rhel7-root6.16.00.config delete mode 100644 mgr/config/v0.3.0-rhel7-root6.24.06.config diff --git a/Dockerfile b/Dockerfile index 5552ecb917b..481b63d2407 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.3.0-${starenv}-${compiler} +FROM ghcr.io/star-bnl/star-spack:v0.2.3-${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 deleted file mode 100644 index bfb649b306d..00000000000 --- a/mgr/config/v0.3.0-rhel7-root5.34.38.config +++ /dev/null @@ -1,16 +0,0 @@ -#!/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 deleted file mode 100644 index b33b1856c90..00000000000 --- a/mgr/config/v0.3.0-rhel7-root6.16.00.config +++ /dev/null @@ -1,16 +0,0 @@ -#!/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 deleted file mode 100644 index 80efe1ef9cb..00000000000 --- a/mgr/config/v0.3.0-rhel7-root6.24.06.config +++ /dev/null @@ -1,16 +0,0 @@ -#!/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