From a5c5a2a8bb654368b9f730a26ec5cae9b127e6ee Mon Sep 17 00:00:00 2001 From: Stephen Herbener <32968781+srherbener@users.noreply.github.com> Date: Tue, 3 Sep 2024 05:43:11 -0600 Subject: [PATCH] spack-stack-1.8.0 config for Discover SCU16, SCU17 (#1282) Co-authored-by: role-r2d2-admin --- configs/sites/tier1/discover-scu16/modules.yaml | 2 -- configs/sites/tier1/discover-scu16/packages.yaml | 8 +------- configs/sites/tier1/discover-scu17/modules.yaml | 2 -- configs/sites/tier1/discover-scu17/packages.yaml | 8 +------- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/configs/sites/tier1/discover-scu16/modules.yaml b/configs/sites/tier1/discover-scu16/modules.yaml index 4c530d42d..65801706f 100644 --- a/configs/sites/tier1/discover-scu16/modules.yaml +++ b/configs/sites/tier1/discover-scu16/modules.yaml @@ -3,7 +3,5 @@ modules: enable:: - lmod lmod: - exclude: - - ecflow include: - python diff --git a/configs/sites/tier1/discover-scu16/packages.yaml b/configs/sites/tier1/discover-scu16/packages.yaml index 4cfc9f64e..d47b8cbaa 100644 --- a/configs/sites/tier1/discover-scu16/packages.yaml +++ b/configs/sites/tier1/discover-scu16/packages.yaml @@ -38,13 +38,6 @@ packages: externals: - spec: diffutils@3.3 prefix: /usr - ecflow:: - buildable: False - externals: - - spec: ecflow@5.8.4+ui+static_boost - prefix: /discover/swdev/jcsda/spack-stack/ecflow-5.8.4 - modules: - - ecflow/5.8.4 file: externals: - spec: file@5.22 @@ -129,6 +122,7 @@ packages: - spec: pkg-config@0.28 prefix: /usr qt: + buildable: False externals: - spec: qt@5.15.2 prefix: /discover/swdev/jcsda/spack-stack/qt-5.15.2/5.15.2/gcc_64 diff --git a/configs/sites/tier1/discover-scu17/modules.yaml b/configs/sites/tier1/discover-scu17/modules.yaml index 4c530d42d..65801706f 100644 --- a/configs/sites/tier1/discover-scu17/modules.yaml +++ b/configs/sites/tier1/discover-scu17/modules.yaml @@ -3,7 +3,5 @@ modules: enable:: - lmod lmod: - exclude: - - ecflow include: - python diff --git a/configs/sites/tier1/discover-scu17/packages.yaml b/configs/sites/tier1/discover-scu17/packages.yaml index 086f342a5..906a2af31 100644 --- a/configs/sites/tier1/discover-scu17/packages.yaml +++ b/configs/sites/tier1/discover-scu17/packages.yaml @@ -46,13 +46,6 @@ packages: externals: - spec: diffutils@3.6 prefix: /usr - ecflow:: - buildable: False - externals: - - spec: ecflow@5.11.4+ui+static_boost - prefix: /discover/swdev/jcsda/spack-stack/scu17/ecflow-5.11.4 - modules: - - ecflow/5.11.4 findutils: externals: - spec: findutils@4.8.0 @@ -119,6 +112,7 @@ packages: - spec: pkg-config@0.29.2 prefix: /usr qt: + buildable: False externals: - spec: qt@5.15.10 prefix: /usr/local/other/xpdf/4.04/Deps