Merge branch 'wait-timeout-measure' into 'master'

Add wait timeout to docker exec measurement job

See merge request gitlab-org/omnibus-gitlab!3588

lib/gitlab/docker_image_memory_measurer.rb

@@ -157,11 +157,11 @@ module Gitlab
       [pid_command_hash_array, smem_result_hash_array]
     end
-    def container_exec_command(container, command, log_file)
+    def container_exec_command(container, command, log_file, timeout = 120)
       # make sure the folder exists
       FileUtils.mkdir_p debug_output_dir unless debug_output_dir.nil?
-      stdout, stderr, code = container.exec(command)
+      stdout, stderr, code = container.exec(command, wait: timeout)
       stdout = stdout.join('')
       stderr = stderr.join('')

spec/gitlab/docker_image_memory_measurer_spec.rb

@@ -159,16 +159,16 @@ describe Gitlab::DockerImageMemoryMeasurer do
     context 'command succeed' do
       it 'return the stdout result' do
-        expect(container).to receive(:exec).with(command).and_return([%w[success message], [], 0])
-        command_ret = measurer.container_exec_command(container, command, log_file)
+        expect(container).to receive(:exec).with(command, wait: 120).and_return([%w[success message], [], 0])
+        command_ret = measurer.container_exec_command(container, command, log_file, 120)
         expect(command_ret).to eq('successmessage')
       end
     end
     context 'command fail' do
       it 'should raise error' do
-        expect(container).to receive(:exec).with(command).and_return([[], %w[error message], 1])
-        expect { measurer.container_exec_command(container, command, log_file) }.to raise_error(SystemExit, 'errormessage')
+        expect(container).to receive(:exec).with(command, wait: 120).and_return([[], %w[error message], 1])
+        expect { measurer.container_exec_command(container, command, log_file, 120) }.to raise_error(SystemExit, 'errormessage')
       end
     end
   end