diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3757a7fc4f..1635f90e2d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -261,10 +261,6 @@ stages: - if: '$CI_PIPELINE_SOURCE =~ /^(api|pipeline|schedule|trigger|web)$/' - if: '$CI_COMMIT_TAG != null' -.api-pipelines-schedules-triggers-web-triggering-rules: &api_pipelines_schedules_triggers_web_triggering_rules - rules: - - if: '$CI_PIPELINE_SOURCE =~ /^(api|pipeline|schedule|trigger|web)$/' - .default-triggering-rules_list: &default_triggering_rules_list - if: '$CI_PIPELINE_SOURCE =~ /^(api|merge_request_event|pipeline|schedule|trigger|web)$/' - if: '$CI_COMMIT_TAG != null' @@ -393,8 +389,7 @@ stages: <<: *base_image stage: performance rules: - - &shotgun_rule_mr - if: '$CI_MERGE_REQUEST_DIFF_BASE_SHA != null' + - if: '$CI_MERGE_REQUEST_DIFF_BASE_SHA != null' variables: BASELINE: '$CI_MERGE_REQUEST_DIFF_BASE_SHA' - &shotgun_rule_tag @@ -1782,9 +1777,6 @@ shotgun:doh-get: SHOTGUN_EVAL_THRESHOLD_LATENCY_PCTL_MAX: 0.4 # bump from the default due to increased tail-end jitter rules: *shotgun_rules_manual_mr -.stress-test: &stress_test - stage: performance - generate-stress-test-configs: <<: *base_image <<: *default_triggering_rules