Merge branch 'ce-to-ee-2018-06-17' into 'master'

CE upstream - 2018-06-17 18:24 UTC

See merge request gitlab-org/gitlab-ee!6166

app/services/ci/register_job_service.rb

@@ -27,7 +27,6 @@ module Ci
 
       valid = true
 
-      if Feature.enabled?('ci_job_request_with_tags_matcher')
       # pick builds that does not have other tags than runner's one
       builds = builds.matches_tag_ids(runner.tags.ids)
 
@@ -35,7 +34,6 @@ module Ci
       unless runner.run_untagged?
         builds = builds.with_any_tags
       end
-      end
 
       builds.find do |build|
         next unless runner.can_pick?(build)

changelogs/unreleased/optimise-paused-runners.yml

+---
+title: Optimise paused runners to reduce amount of used requests
+merge_request:
+author:
+type: performance

changelogs/unreleased/remove-ci_job_request_with_tags_matcher.yml

+---
+title: Remove the ci_job_request_with_tags_matcher
+merge_request:
+author:
+type: performance

lib/api/runner.rb

@@ -84,7 +84,11 @@ module API
       end
       post '/request' do
         authenticate_runner!
-        no_content! unless current_runner.active?
+
+        unless current_runner.active?
+          header 'X-GitLab-Last-Update', current_runner.ensure_runner_queue_value
+          break no_content!
+        end
 
         if current_runner.runner_queue_value_latest?(params[:last_update])
           header 'X-GitLab-Last-Update', params[:last_update]

spec/requests/api/runner_spec.rb

@@ -356,11 +356,13 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
       context 'when valid token is provided' do
         context 'when Runner is not active' do
           let(:runner) { create(:ci_runner, :inactive) }
+          let(:update_value) { runner.ensure_runner_queue_value }
 
           it 'returns 204 error' do
             request_job
 
-            expect(response).to have_gitlab_http_status 204
+            expect(response).to have_gitlab_http_status(204)
+            expect(response.header['X-GitLab-Last-Update']).to eq(update_value)
           end
         end