Skip to content

Commit 0ae59cb

Browse files
Remove lassen and unused machines from gitlab ci (#28)
* Remove lassen and unused machines from gitlab ci
1 parent 7f0e146 commit 0ae59cb

File tree

2 files changed

+2
-82
lines changed

2 files changed

+2
-82
lines changed

.gitlab/custom-jobs-and-variables.yml

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -12,47 +12,15 @@ variables:
1212
# named so that we are sure to retrieve it and avoid collisions.
1313
ALLOC_NAME: ${CI_PROJECT_NAME}_ci_${CI_PIPELINE_ID}
1414

15-
# Ruby
16-
# Arguments for top level allocation
17-
RUBY_SHARED_ALLOC: "--mpi=none --exclusive --reservation=ci --time=20 --nodes=1"
18-
# Arguments for job level allocation
19-
RUBY_JOB_ALLOC: "--mpi=none --reservation=ci --nodes=1"
20-
# Add variables that should apply to all the jobs on a machine:
21-
# RUBY_MY_VAR: "..."
22-
23-
# Poodle
24-
# Arguments for top level allocation
25-
POODLE_SHARED_ALLOC: "--exclusive --partition=pdebug --time=10 --nodes=1"
26-
# Arguments for job level allocation
27-
POODLE_JOB_ALLOC: "--nodes=1"
28-
# Add variables that should apply to all the jobs on a machine:
29-
# POODLE_MY_VAR: "..."
30-
31-
# Corona
32-
# Arguments for top level allocation
33-
# OPTIONAL: "-o per-resource.count=2" allows to get 2 jobs running on each node.
34-
CORONA_SHARED_ALLOC: "--exclusive --time-limit=15m --nodes=1"
35-
# Arguments for job level allocation
36-
CORONA_JOB_ALLOC: "--nodes=1 --begin-time=+5s"
37-
# Add variables that should apply to all the jobs on a machine:
38-
# CORONA_MY_VAR: "..."
39-
4015
# Tioga
4116
# Arguments for top level allocation
4217
# OPTIONAL: "-o per-resource.count=2" allows to get 2 jobs running on each node.
43-
TIOGA_SHARED_ALLOC: "--queue=pci --exclusive --time-limit=15m --nodes=1"
18+
# TIOGA_SHARED_ALLOC: "--queue=pci --exclusive --time-limit=15m --nodes=1"
4419
# Arguments for job level allocation
45-
TIOGA_JOB_ALLOC: "--nodes=1 --begin-time=+5s"
20+
# TIOGA_JOB_ALLOC: "--nodes=1 --begin-time=+5s"
4621
# Add variables that should apply to all the jobs on a machine:
4722
# TIOGA_MY_VAR: "..."
4823

49-
# Lassen uses a different job scheduler (spectrum lsf) that does not allow
50-
# pre-allocation the same way slurm does. Arguments for job level allocation
51-
LASSEN_JOB_ALLOC: "1 -W 30 -q pci"
52-
# Add variables that should apply to all the jobs on a machine:
53-
# LASSEN_MY_VAR: "..."
54-
55-
5624
# Configuration shared by build and test jobs specific to this project.
5725
# Not all configuration can be shared. Here projects can fine tune the
5826
# CI behavior.

.gitlab/subscribed-pipelines.yml

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -29,42 +29,7 @@
2929
# Comment the jobs for machines you don’t need.
3030
###
3131

32-
# RUBY
33-
#ruby-up-check:
34-
# variables:
35-
# CI_MACHINE: "ruby"
36-
# extends: [.machine-check]
37-
#
38-
#ruby-build-and-test:
39-
# variables:
40-
# CI_MACHINE: "ruby"
41-
# needs: [ruby-up-check]
42-
# extends: [.build-and-test]
4332

44-
## POODLE
45-
#poodle-up-check:
46-
# variables:
47-
# CI_MACHINE: "poodle"
48-
# extends: [.machine-check]
49-
#
50-
#poodle-build-and-test:
51-
# variables:
52-
# CI_MACHINE: "poodle"
53-
# needs: [poodle-up-check]
54-
# extends: [.build-and-test]
55-
#
56-
## CORONA
57-
#corona-up-check:
58-
# variables:
59-
# CI_MACHINE: "corona"
60-
# extends: [.machine-check]
61-
#
62-
#corona-build-and-test:
63-
# variables:
64-
# CI_MACHINE: "corona"
65-
# needs: [corona-up-check]
66-
# extends: [.build-and-test]
67-
#
6833
## TIOGA
6934
#tioga-up-check:
7035
# variables:
@@ -76,16 +41,3 @@
7641
# CI_MACHINE: "tioga"
7742
# needs: [tioga-up-check]
7843
# extends: [.build-and-test]
79-
80-
# LASSEN
81-
lassen-up-check:
82-
variables:
83-
CI_MACHINE: "lassen"
84-
extends: [.machine-check]
85-
86-
lassen-build-and-test:
87-
variables:
88-
CI_MACHINE: "lassen"
89-
needs: [lassen-up-check]
90-
extends: [.build-and-test]
91-

0 commit comments

Comments
 (0)