Removed all toss3 info from configurations, changed blue os gcc versi…

…on from 8.3.1 to 10.3.1 everywhere

.gitlab/os.yml

@@ -7,14 +7,6 @@
     UPSTREAM_DIR: /usr/WS2/sduser/Spheral/spack_upstream/0.22
     DISPLAY: ':0.0'
 
-.on_toss_3_x86:
-  variables:
-    ARCH: 'toss_3_x86_64_ib'
-    GCC_VERSION: '8.3.1'
-    CLANG_VERSION: '9.0.0'
-    SPHERAL_BUILDS_DIR: /p/lustre1/sphapp/spheral-ci-builds
-  extends: [.sys_config]
-
 .on_toss_4_x86:
   variables:
     ARCH: 'toss_4_x86_64_ib'
@@ -26,7 +18,7 @@
 .on_blueos_3_ppc64:
   variables:
     ARCH: 'blueos_3_ppc64le_ib_p9'
-    GCC_VERSION: '8.3.1'
+    GCC_VERSION: '10.3.1'
     CLANG_VERSION: '9.0.0'
     SPHERAL_BUILDS_DIR: /p/gpfs1/sphapp/spheral-ci-builds
   extends: [.sys_config]

Dockerfile

@@ -2,7 +2,7 @@
 #   sudo env DOCKERBUILDKIT=1 docker build . --target spheral-build-env-local --tag spheral-build-env (--progress=plain)
 #   Optional Arguments:
 #     --progress=plain        : Prints plain output to terminal instead of windowed version.
-#     --build-args SPEC=...   : Specify optional build argument to override. Defualt = gcc
+#     --build-args SPEC=...   : Specify optional build argument to override. Default = gcc
 #                               e.g. --build-args SPEC=clang 
 
 # To build and run a spheral test:

scripts/devtools/spec-list.json

@@ -6,16 +6,10 @@
         "[email protected]"
       ]
     ,
-    "toss_3_x86_64_ib": [
-        "[email protected]",
-        "[email protected]~mpi",
-        "[email protected]"
-      ]
-    ,
     "blueos_3_ppc64le_ib_p9": [
-        "gcc@8.3.1",
-        "gcc@8.3.1+cuda~mpi cuda_arch=70",
-        "gcc@8.3.1+cuda cuda_arch=70"
+        "gcc@10.3.1",
+        "gcc@10.3.1+cuda~mpi cuda_arch=70",
+        "gcc@10.3.1+cuda cuda_arch=70"
       ]
   }
 }

scripts/spack/configs/blueos_3_ppc64le_ib/compilers.yaml

@@ -12,19 +12,6 @@ compilers:
     modules: []
     environment: {}
     extra_rpaths: []
-- compiler:
-    spec: [email protected]
-    paths:
-      cc: /usr/tce/packages/gcc/gcc-8.3.1/bin/gcc
-      cxx: /usr/tce/packages/gcc/gcc-8.3.1/bin/g++
-      f77: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran
-      fc: /usr/tce/packages/gcc/gcc-8.3.1/bin/gfortran
-    flags: {}
-    operating_system: rhel7
-    target: ppc64le
-    modules: []
-    environment: {}
-    extra_rpaths: []
 - compiler:
     spec: [email protected]
     paths: