File tree Expand file tree Collapse file tree 2 files changed +2
-19
lines changed Expand file tree Collapse file tree 2 files changed +2
-19
lines changed Original file line number Diff line number Diff line change @@ -65,25 +65,11 @@ variables:
65
65
stages :
66
66
- prerequisites
67
67
- build-and-test
68
-
69
- # Template for jobs that should NOT run during performance schedules
70
- .not-performance-schedule-rule :
71
- rules :
72
- - if : $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_TYPE == "weekly_performance"
73
- when : never
74
- - when : always
75
-
76
- # Template for jobs that should run ONLY during performance schedules or manually
77
- .performance-schedule-rule :
78
- rules :
79
- - if : $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_TYPE == "weekly_performance"
80
- when : always
81
- - when : always
68
+ - perf-test
82
69
83
70
# Template for jobs triggering a build-and-test sub-pipeline:
84
71
.build-and-test :
85
72
stage : build-and-test
86
- extends : [.not-performance-schedule-rule]
87
73
trigger :
88
74
include :
89
75
- local : ' .gitlab/custom-jobs-and-variables.yml'
@@ -97,8 +83,7 @@ stages:
97
83
pipeline_variables : true
98
84
99
85
.performance-test :
100
- stage : build-and-test
101
- extends : [.performance-schedule-rule]
86
+ stage : perf-test
102
87
trigger :
103
88
include :
104
89
- local : ' .gitlab/custom-jobs-and-variables.yml'
Original file line number Diff line number Diff line change 28
28
generate-job-lists :
29
29
stage : prerequisites
30
30
tags : [shell, oslic]
31
- extends : [.not-performance-schedule-rule]
32
31
variables :
33
32
RADIUSS_JOBS_PATH : " .ci-scripts/radiuss-spack-configs/gitlab/radiuss-jobs"
34
33
LOCAL_JOBS_PATH : " .gitlab/jobs"
@@ -87,5 +86,4 @@ lassen-build-and-test:
87
86
ruby-performance-test :
88
87
variables :
89
88
CI_MACHINE : " ruby"
90
- needs : [ruby-up-check]
91
89
extends : [.performance-test]
You can’t perform that action at this time.
0 commit comments