Skip to content

Commit

Permalink
CI updates (#244)
Browse files Browse the repository at this point in the history
* Updates radiuss-spack-configs to commit a37c3e1
* Changes to match the CI of other projects
  • Loading branch information
adayton1 authored Feb 14, 2024
1 parent 99c4f69 commit 719da54
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 9 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ Win32/chai.vcxproj.user
Win32/.vs/
Win32/x64/
*.aps
*.orig
8 changes: 4 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
# We define the following GitLab pipeline variables:
variables:
##### LC GITLAB CONFIGURATION
# Use the umdev LLNL service user to run CI. This prevents from running
# pipelines as an actual user.
# Use an LLNL service user to run CI. This prevents from running pipelines as an
# actual user.
LLNL_SERVICE_USER: umdev
# Use the service user workspace. Solves permission issues, stores everything
# at the same location whoever triggers a pipeline.
Expand All @@ -38,8 +38,8 @@ variables:
GIT_SUBMODULE_STRATEGY: recursive

##### PROJECT VARIABLES
# We build the projects in the CI clone directory.
# Used in script/gitlab/build_and_test.sh script.
# We build the projects in the CI clone directory (used in
# script/gitlab/build_and_test.sh script).
# TODO: add a clean-up mechanism.
BUILD_ROOT: ${CI_PROJECT_DIR}

Expand Down
7 changes: 4 additions & 3 deletions .gitlab/custom-jobs-and-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ variables:
# Lassen and Butte use a different job scheduler (spectrum lsf) that does not
# allow pre-allocation the same way slurm does.
# Arguments for job level allocation
LASSEN_JOB_ALLOC: "1 -W 8"
LASSEN_JOB_ALLOC: "1 -W 8 -q pci"
# Project specific variants for lassen
PROJECT_LASSEN_VARIANTS: "~shared +raja cuda_arch=70 tests=basic"
# Project specific deps for lassen
Expand All @@ -68,5 +68,6 @@ variables:
# CI behavior.
# See Umpire for an example (export junit test reports).
.custom_job:
variables:
JOB_TEMPLATE_CANNOT_BE_EMPTY: "True"
artifacts:
reports:
junit: junit.xml
2 changes: 1 addition & 1 deletion .gitlab/jobs/lassen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ xl_2022_08_19_gcc_8_3_1_cuda_11_2_0:
variables:
SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %[email protected] ^[email protected]+allow-unsupported-compilers ${PROJECT_LASSEN_DEPS}"
MODULE_LIST: "cuda/11.2.0"
LASSEN_JOB_ALLOC: "1 -W 12"
LASSEN_JOB_ALLOC: "1 -W 12 -q pci"
extends: .job_on_lassen


Expand Down
1 change: 1 addition & 0 deletions scripts/gitlab/build_and_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ then
$cmake_exe --build . --verbose -j 1
else
# todo this should use cmake --install once we use CMake 3.15+ everywhere
#$cmake_exe --install .
make install
fi
date
Expand Down

0 comments on commit 719da54

Please sign in to comment.