summaryrefslogtreecommitdiff
path: root/spec/services/ci
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-12-01 09:51:31 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-12-01 09:51:31 +0000
commit37d5cece3603d8df9f75c507594e70dade80c99f (patch)
tree84e6d51a3329b4f9bd13bf92e61fe401446e2d2a /spec/services/ci
parentf8796c0836e943a27e26250c7cd4a5766e567f61 (diff)
downloadgitlab-ce-37d5cece3603d8df9f75c507594e70dade80c99f.tar.gz
Add latest changes from gitlab-org/gitlab@14-5-stable-ee
Diffstat (limited to 'spec/services/ci')
-rw-r--r--spec/services/ci/job_artifacts/create_service_spec.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/services/ci/job_artifacts/create_service_spec.rb b/spec/services/ci/job_artifacts/create_service_spec.rb
index 6ad3e9ceb54..2d309bfe425 100644
--- a/spec/services/ci/job_artifacts/create_service_spec.rb
+++ b/spec/services/ci/job_artifacts/create_service_spec.rb
@@ -24,6 +24,8 @@ RSpec.describe Ci::JobArtifacts::CreateService do
def file_to_upload(path, params = {})
upload = Tempfile.new('upload')
FileUtils.copy(path, upload.path)
+ # This is a workaround for https://github.com/docker/for-linux/issues/1015
+ FileUtils.touch(upload.path)
UploadedFile.new(upload.path, **params)
end