Commit 4cca1014 authored by Henderson, Shane's avatar Henderson, Shane
Browse files

Update Spack environment used

Squash branch 'runnerUpdate' into 'master'

* Update spack environment used

Changes build environment to use a Spack installed environment

**Developer Checklist:**
- [x] Have you done a self-review after creating the merge request?
- [x] Have you filled in the Merge Request information (title, description) thoroughly?
- [x] Have you updated the relevant tickets (if this MR is linked to any VERA-dev tickets)?
- [ ] Have you addressed all suggested feedback and commented on it to let the reviewer know? (Do not resolve discussions that the reviewer started)

**Reviewer Checklist:**
- [x] Have you confirmed all discussions were adequately addressed and resolved them all?
- [x] Does it conform to formatting guidelines?
- [x] Are there adequate and clear comments?
- [x] Is the design clean and sensible?
- [x] Are the changes optimal/efficient?
- [x] Were sufficient DBC checks added?
- [x] Are there unit tests? (if necessary)
- [x] Is the MR description clear, including a link to the VERA-Dev issue if appropriate?

**PSM Checklist**
- [x] Have you confirmed that all discussions were addressed, or that follow-on issues have been created for them?
- [x] Have you confirmed sufficient testing was conducted?
- [x] Does this impact other repositories?
- [x] Does the MR have an adequate description?
- [x] If the MR has multiple commits, did you set the MR to squash merge?

See merge request https://code.ornl.gov/futility/Futility/-/merge_requests/406
parent c0650690
Loading
Loading
Loading
Loading
+6 −8
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ build_serial_debug:
    - vm
  script:
    - . /data/spack/share/spack/setup-env.sh
    - spack env activate vera44
    - spack env activate vera_gcc85_mpich343
    - build_scripts/build_with_spack.sh
      -DPYTHON_EXECUTABLE=/usr/bin/python2.7
      -DPYTHON_EXECUTABLE=`which python`
      -DCMAKE_BUILD_TYPE:STRING="DEBUG"
      -DTPL_ENABLE_MPI:BOOL=OFF
      -S $CI_PROJECT_DIR -B $CI_PROJECT_DIR/build
@@ -44,9 +44,9 @@ build_mpi_debug:
    - vm
  script:
    - . /data/spack/share/spack/setup-env.sh
    - spack env activate vera44
    - spack env activate vera_gcc85_mpich343
    - build_scripts/build_with_spack.sh
      -DPYTHON_EXECUTABLE=/usr/bin/python2.7
      -DPYTHON_EXECUTABLE=`which python`
      -DCMAKE_BUILD_TYPE:STRING="DEBUG"
      -DFutility_FPE_TRAP:BOOL=ON
      -DTPL_ENABLE_MPI:BOOL=ON
@@ -73,13 +73,11 @@ build_mpi_release:
  tags:
    - linux
    - vm
  rules:
    - when: manual
  script:
    - . /data/spack/share/spack/setup-env.sh
    - spack env activate vera44
    - spack env activate vera_gcc85_mpich343
    - build_scripts/build_with_spack.sh
      -DPYTHON_EXECUTABLE=/usr/bin/python2.7
      -DPYTHON_EXECUTABLE=`which python`
      -DCMAKE_BUILD_TYPE:STRING="RELEASE"
      -DTPL_ENABLE_MPI:BOOL=ON
      -DCMAKE_Fortran_COMPILER=`which mpif90`