From 5b3af860910d4375713d0246aa6f8724b4da806c Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Fri, 25 May 2018 15:27:33 +0000 Subject: Update object_storage.rb --- app/uploaders/object_storage.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/uploaders/object_storage.rb b/app/uploaders/object_storage.rb index f2a8afccdeb..3fd27d9acdc 100644 --- a/app/uploaders/object_storage.rb +++ b/app/uploaders/object_storage.rb @@ -11,7 +11,7 @@ module ObjectStorage ObjectStorageUnavailable = Class.new(StandardError) DIRECT_UPLOAD_TIMEOUT = 4.hours - TMP_UPLOAD_PATH = 'tmp/upload'.freeze + TMP_UPLOAD_PATH = 'tmp/uploads'.freeze module Store LOCAL = 1 -- cgit v1.2.1 From cb2802dbbcacd867336c9d1da214a1c7a9047089 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Mon, 28 May 2018 10:44:26 +0900 Subject: Fix spec --- spec/requests/api/runner_spec.rb | 2 +- spec/requests/lfs_http_spec.rb | 2 +- spec/uploaders/object_storage_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb index efb9bddde44..5030af2ee66 100644 --- a/spec/requests/api/runner_spec.rb +++ b/spec/requests/api/runner_spec.rb @@ -1210,7 +1210,7 @@ describe API::Runner, :clean_gitlab_redis_shared_state do before do fog_connection.directories.get('artifacts').files.create( - key: 'tmp/upload/12312300', + key: 'tmp/uploads/12312300', body: 'content' ) diff --git a/spec/requests/lfs_http_spec.rb b/spec/requests/lfs_http_spec.rb index f80abb06fca..79672fe1cc5 100644 --- a/spec/requests/lfs_http_spec.rb +++ b/spec/requests/lfs_http_spec.rb @@ -1089,7 +1089,7 @@ describe 'Git LFS API and storage' do context 'with valid remote_id' do before do fog_connection.directories.get('lfs-objects').files.create( - key: 'tmp/upload/12312300', + key: 'tmp/uploads/12312300', body: 'content' ) end diff --git a/spec/uploaders/object_storage_spec.rb b/spec/uploaders/object_storage_spec.rb index e7277b337f6..4165a005063 100644 --- a/spec/uploaders/object_storage_spec.rb +++ b/spec/uploaders/object_storage_spec.rb @@ -618,7 +618,7 @@ describe ObjectStorage do let!(:fog_file) do fog_connection.directories.get('uploads').files.create( - key: 'tmp/upload/test/123123', + key: 'tmp/uploads/test/123123', body: 'content' ) end -- cgit v1.2.1 From acdea516c1d14ef17256858507b7a4316f01350f Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Mon, 28 May 2018 21:02:15 +0900 Subject: Add changelog --- changelogs/unreleased/patch-28.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/patch-28.yml diff --git a/changelogs/unreleased/patch-28.yml b/changelogs/unreleased/patch-28.yml new file mode 100644 index 00000000000..1bbca138cae --- /dev/null +++ b/changelogs/unreleased/patch-28.yml @@ -0,0 +1,5 @@ +--- +title: Fix FreeBSD can not upload artifacts due to wrong tmp path +merge_request: 19148 +author: +type: fixed -- cgit v1.2.1