Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/ci/config/external/file/artifact.rb')
-rw-r--r--lib/gitlab/ci/config/external/file/artifact.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/gitlab/ci/config/external/file/artifact.rb b/lib/gitlab/ci/config/external/file/artifact.rb
index 140cbfac5c1..0b90d240a15 100644
--- a/lib/gitlab/ci/config/external/file/artifact.rb
+++ b/lib/gitlab/ci/config/external/file/artifact.rb
@@ -20,8 +20,6 @@ module Gitlab
def content
strong_memoize(:content) do
- next unless artifact_job
-
Gitlab::Ci::ArtifactFileReader.new(artifact_job).read(location)
rescue Gitlab::Ci::ArtifactFileReader::Error => error
errors.push(error.message)
@@ -36,8 +34,6 @@ module Gitlab
)
end
- private
-
def validate_context!
context.logger.instrument(:config_file_artifact_validate_context) do
if !creating_child_pipeline?
@@ -54,10 +50,10 @@ module Gitlab
errors.push("File `#{masked_location}` is empty!") unless content.present?
end
+ private
+
def artifact_job
strong_memoize(:artifact_job) do
- next unless creating_child_pipeline?
-
context.parent_pipeline.find_job_with_archive_artifacts(job_name)
end
end