Skip to content

Commit 1baa0cd

Browse files
committed
Make performance tests run in stage perf-test after regression tests and remove weekly schedule
1 parent 6488fbc commit 1baa0cd

File tree

2 files changed

+2
-19
lines changed

2 files changed

+2
-19
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -65,25 +65,11 @@ variables:
6565
stages:
6666
- prerequisites
6767
- 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
8269

8370
# Template for jobs triggering a build-and-test sub-pipeline:
8471
.build-and-test:
8572
stage: build-and-test
86-
extends: [.not-performance-schedule-rule]
8773
trigger:
8874
include:
8975
- local: '.gitlab/custom-jobs-and-variables.yml'
@@ -97,8 +83,7 @@ stages:
9783
pipeline_variables: true
9884

9985
.performance-test:
100-
stage: build-and-test
101-
extends: [.performance-schedule-rule]
86+
stage: perf-test
10287
trigger:
10388
include:
10489
- local: '.gitlab/custom-jobs-and-variables.yml'

.gitlab/subscribed-pipelines.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
generate-job-lists:
2929
stage: prerequisites
3030
tags: [shell, oslic]
31-
extends: [.not-performance-schedule-rule]
3231
variables:
3332
RADIUSS_JOBS_PATH: ".ci-scripts/radiuss-spack-configs/gitlab/radiuss-jobs"
3433
LOCAL_JOBS_PATH: ".gitlab/jobs"
@@ -87,5 +86,4 @@ lassen-build-and-test:
8786
ruby-performance-test:
8887
variables:
8988
CI_MACHINE: "ruby"
90-
needs: [ruby-up-check]
9189
extends: [.performance-test]

0 commit comments

Comments
 (0)