Automatic merge of gitlab-org/gitlab-ce master

app/services/ci/destroy_pipeline_service.rb

@@ -6,6 +6,8 @@ module Ci
       raise Gitlab::Access::AccessDeniedError unless can?(current_user, :destroy_pipeline, pipeline)
 
       pipeline.destroy!
+
+      Gitlab::Cache::Ci::ProjectPipelineStatus.new(pipeline.project).delete_from_cache
     end
   end
 end

changelogs/unreleased/sh-clear-pipeline-status-cache-upon-destroy.yml

+---
+title: Clear pipeline status cache after destruction of pipeline
+merge_request: 26575
+author:
+type: fixed

qa/Rakefile

@@ -27,9 +27,9 @@ task :run_artillery_load_tests do
     end
 
     urls = YAML.safe_load(File.read(urls_file))
-    ENV['HOST_URL'] = urls[:host]
-    ENV['LARGE_ISSUE_URL'] = urls[:large_issue]
-    ENV['LARGE_MR_URL'] = urls[:large_mr]
+    ENV['HOST_URL'] = urls["host"]
+    ENV['LARGE_ISSUE_URL'] = urls["large_issue"]
+    ENV['LARGE_MR_URL'] = urls["large_mr"]
   end
 
   sh('artillery run load/artillery.yml -o report.json')

qa/load/artillery.yml

 config:
   target: "{{ $processEnvironment.HOST_URL }}"
+  http:
+    pool: 10 # All HTTP requests from all virtual users will be sent over the same <pool> connections.
+             # This also means that there is a limit on the number of requests sent per second.
   phases:
-    - duration: 60
-      arrivalRate: 1
+    - duration: 30
+      arrivalRate: 10
       name: "Warm up"
-    - duration: 120
-      arrivalRate: 1
-      rampTo: 50
+    - duration: 90
+      arrivalRate: 10
+      rampTo: 100
       name: "Gradual ramp up"
-    - duration: 60
-      arrivalRate: 50
+    - duration: 90
+      arrivalRate: 100
       name: "Sustained max load"
 scenarios:
   - name: "Visit large issue url"

qa/qa/tools/generate_perf_testdata.rb

@@ -46,7 +46,7 @@ module QA
 
         threads_arr.each(&:join)
         STDOUT.puts "\nURLs: #{@urls}"
-        File.open("urls.yml", "w") { |file| file.puts @urls.to_yaml }
+        File.open("urls.yml", "w") { |file| file.puts @urls.stringify_keys.to_yaml }
         STDOUT.puts "\nDone"
       end
 

spec/services/ci/destroy_pipeline_service_spec.rb

@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 describe ::Ci::DestroyPipelineService do
-  let(:project) { create(:project) }
-  let!(:pipeline) { create(:ci_pipeline, project: project) }
+  let(:project) { create(:project, :repository) }
+  let!(:pipeline) { create(:ci_pipeline, :success, project: project, sha: project.commit.id) }
 
   subject { described_class.new(project, user).execute(pipeline) }