diff options
Diffstat (limited to 'app/models/ci/pipeline.rb')
| -rw-r--r-- | app/models/ci/pipeline.rb | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index ae3ea7aa03f..2d0479e02a3 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -824,6 +824,8 @@ module Ci variables.append(key: 'CI_OPEN_MERGE_REQUESTS', value: open_merge_requests_refs.join(',')) end + variables.append(key: 'CI_GITLAB_FIPS_MODE', value: 'true') if Gitlab::FIPS.enabled? + variables.append(key: 'CI_KUBERNETES_ACTIVE', value: 'true') if has_kubernetes_active? variables.append(key: 'CI_DEPLOY_FREEZE', value: 'true') if freeze_period? @@ -836,6 +838,8 @@ module Ci def predefined_commit_variables strong_memoize(:predefined_commit_variables) do Gitlab::Ci::Variables::Collection.new.tap do |variables| + next variables unless sha.present? + variables.append(key: 'CI_COMMIT_SHA', value: sha) variables.append(key: 'CI_COMMIT_SHORT_SHA', value: short_sha) variables.append(key: 'CI_COMMIT_BEFORE_SHA', value: before_sha) @@ -955,7 +959,7 @@ module Ci Ci::Build.latest.where(pipeline: self_and_descendants) end - def environments_in_self_and_descendants + def environments_in_self_and_descendants(deployment_status: nil) # We limit to 100 unique environments for application safety. # See: https://gitlab.com/gitlab-org/gitlab/-/issues/340781#note_699114700 expanded_environment_names = @@ -965,7 +969,7 @@ module Ci .limit(100) .pluck(:expanded_environment_name) - Environment.where(project: project, name: expanded_environment_names).with_deployment(sha) + Environment.where(project: project, name: expanded_environment_names).with_deployment(sha, status: deployment_status) end # With multi-project and parent-child pipelines @@ -1285,6 +1289,12 @@ module Ci end end + def has_expired_test_reports? + strong_memoize(:artifacts_expired) do + !has_reports?(::Ci::JobArtifact.test_reports.not_expired) + end + end + private def add_message(severity, content) |