Skip to content

Commit

Permalink
Update Gitlab CI deps and jobs
Browse files Browse the repository at this point in the history
Update Gitlab CI environments, dependencies, and jobs to reflect
what UnifyFS now uses, as well as what is now available on the
testing systems.
  • Loading branch information
CamStan committed Dec 20, 2023
1 parent bd8c047 commit 9577582
Show file tree
Hide file tree
Showing 11 changed files with 192 additions and 280 deletions.
7 changes: 4 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,9 @@ before_script:
# Running with lsf tag here, but this may be too vague as the job may attempt to
# use a runner on a system the service user doesn't have permission to access.
# If so, move this job to a specific system.
full_clean:
# TODO: this fails when the rm tries to run on the path this job is running
# from. Rewrite to exclude current runner.
.full_clean:
stage: clean
extends: .base-template
variables:
Expand All @@ -166,12 +168,11 @@ full_clean:
tags:
- shell
before_script: []
script: rm -rf ${HOME}/.jacamar-ci/*
script: rm -rf ${WORKSPACE}/.jacamar-ci/*
needs: []

# System specific jobs
include:
- local: .gitlab/ascent.yml
- local: .gitlab/catalyst.yml
- local: .gitlab/lassen.yml
- local: .gitlab/quartz.yml
175 changes: 0 additions & 175 deletions .gitlab/catalyst.yml

This file was deleted.

73 changes: 73 additions & 0 deletions .gitlab/lassen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,76 @@ lassen-gcc-8_3_1-integ-test-scheduled-stage:
CI_TEST_OPTIONS: ":: -s stage"
extends: [.lsf-multi-node-template, .lassen-scheduled-batch-template, .lassen-gcc-8_3_1-template, .integ-test-template]
needs: ["lassen-gcc-8_3_1-scheduled-build"]


### gcc@11.2.1 ###
.lassen-gcc-11_2_1-template:
variables:
COMPILER: gcc/11.2.1
CC_COMMAND: "which gcc"
FC_COMMAND: "which gfortran"
SPACK_ENV_NAME: "unifyfs-lsf-gcc11_2_1"

lassen-gcc-11_2_1-install-deps:
extends: [.lassen-shell-template, .lassen-gcc-11_2_1-template, .install-deps-template]

lassen-gcc-11_2_1-build:
extends: [.lassen-shell-template, .lassen-gcc-11_2_1-template, .build-template]
needs: ["lassen-gcc-11_2_1-install-deps"]

lassen-gcc-11_2_1-unit-test:
extends: [.lsf-single-node-template, .lassen-batch-template, .lassen-gcc-11_2_1-template, .unit-test-template]
needs: ["lassen-gcc-11_2_1-build"]

# Integration tests

lassen-gcc-11_2_1-integ-test-writeread-posix:
variables:
CI_TEST_OPTIONS: ":: -s writeread -t posix"
extends: [.lsf-multi-node-template, .lassen-batch-template, .lassen-gcc-11_2_1-template, .integ-test-template]
needs: ["lassen-gcc-11_2_1-build"]

lassen-gcc-11_2_1-integ-test-writeread-mpiio:
variables:
CI_TEST_OPTIONS: ":: -s writeread -t mpiio"
extends: [.lsf-multi-node-template, .lassen-batch-template, .lassen-gcc-11_2_1-template, .integ-test-template]
needs: ["lassen-gcc-11_2_1-build"]

lassen-gcc-11_2_1-integ-test-read-posix:
variables:
CI_TEST_OPTIONS: ":: -s read -t posix"
extends: [.lsf-multi-node-template, .lassen-batch-template, .lassen-gcc-11_2_1-template, .integ-test-template]
needs: ["lassen-gcc-11_2_1-build"]

lassen-gcc-11_2_1-integ-test-read-mpiio:
variables:
CI_TEST_OPTIONS: ":: -s read -t mpiio"
extends: [.lsf-multi-node-template, .lassen-batch-template, .lassen-gcc-11_2_1-template, .integ-test-template]
needs: ["lassen-gcc-11_2_1-build"]

lassen-gcc-11_2_1-integ-test-pc-all:
variables:
CI_TEST_OPTIONS: ":: -s pc -t all"
extends: [.lsf-multi-node-template, .lassen-batch-template, .lassen-gcc-11_2_1-template, .integ-test-template]
needs: ["lassen-gcc-11_2_1-build"]

lassen-gcc-11_2_1-integ-test-stage:
variables:
CI_TEST_OPTIONS: ":: -s stage"
extends: [.lsf-multi-node-template, .lassen-batch-template, .lassen-gcc-11_2_1-template, .integ-test-template]
needs: ["lassen-gcc-11_2_1-build"]

# Larger Scheduled Stage Job(s)

lassen-gcc-11_2_1-scheduled-install-deps:
extends: [.lassen-scheduled-shell-template, .lassen-gcc-11_2_1-template, .install-deps-template]

lassen-gcc-11_2_1-scheduled-build:
extends: [.lassen-scheduled-shell-template, .lassen-gcc-11_2_1-template, .build-template]
needs: ["lassen-gcc-11_2_1-scheduled-install-deps"]

lassen-gcc-11_2_1-integ-test-scheduled-stage:
variables:
CI_TEST_OPTIONS: ":: -s stage"
extends: [.lsf-multi-node-template, .lassen-scheduled-batch-template, .lassen-gcc-11_2_1-template, .integ-test-template]
needs: ["lassen-gcc-11_2_1-scheduled-build"]
Loading

0 comments on commit 9577582

Please sign in to comment.