Remove outdated mirrors and speed up compilation of dev-build

lanl · Jul 1, 2022 · c7d755b · c7d755b
1 parent 210af82
commit c7d755b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -28,6 +28,7 @@ before_script:
   - sed -i "s;XCAP_OSS_SPACK_DIR_TMP;${XCAP_OSS_SPACK_DIR};g" "${TMPDIR}/spack/etc/spack/upstreams.yaml"
   - rm ${TMPDIR}/spack/etc/spack/repos.yaml ${TMPDIR}/spack/etc/spack/packages.yaml
   - cp ${XCAP_OSS_SPACK_DIR}/etc/spack/${PLATFORM}/*.yaml ${TMPDIR}/spack/etc/spack/${PLATFORM}/
+  - rm $TMPDIR/spack/etc/spack/mirrors.yaml
   - source ${TMPDIR}/spack/share/spack/setup-env.sh
   - spack compiler list
   - spack repo add --scope site ${CI_PROJECT_DIR}/spack-repo
@@ -140,7 +141,7 @@ before_script:
     - spack env create --without-view -d ${TMPDIR}/spack_env
     - spack env activate -d ${TMPDIR}/spack_env
     - spack spec -I ${SINGULARITY_EOS_SPACK_SPEC}
-    - spack dev-build -q ${SINGULARITY_EOS_SPACK_SPEC} || ( cat spack-build-out.txt && exit 1 )
+    - spack dev-build -j $(nproc) -q ${SINGULARITY_EOS_SPACK_SPEC} || ( cat spack-build-out.txt && exit 1 )
     - export SINGULARITY_EOS_CMD="spack install --show-log-on-error --no-checksum --yes-to-all ${SINGULARITY_EOS_SPACK_SPEC}"
     - ( echo "$SINGULARITY_EOS_CMD" && $SINGULARITY_EOS_CMD )
     - source ${TMPDIR}/spack/share/spack/setup-env.sh
@@ -177,7 +178,7 @@ before_script:
             -DSINGULARITY_USE_KOKKOSKERNELS=${SINGULARITY_USE_CUDA:-OFF} \
             -DSINGULARITY_USE_FORTRAN=${SINGULARITY_USE_FORTRAN:-OFF} \
             ..
-    - make -j || make VERBOSE=1
+    - make -j $(nproc) || make VERBOSE=1
     - |
       if [[ ${CI_JOB_NAME} =~ "install" ]];
       then