closes #6064

Merge branch '6064-collection-output-of-perf-issue'

diff --git a/apps/workbench/app/views/collections/_show_source_summary.html.erb b/apps/workbench/app/views/collections/_show_source_summary.html.erb
index 3d8032b4c214d975395bb894cac3432543985d6f..ddcdc12343f4b9b3c3ad9480249194eaa0793d76 100644 (file)
--- a/apps/workbench/app/views/collections/_show_source_summary.html.erb
+++ b/apps/workbench/app/views/collections/_show_source_summary.html.erb
@@ -7,8 +7,15 @@
 <% end %>
 
 <% if @output_of.andand.any? %>
-  <p><i>This collection was the output of:</i><br />
-    <% pipelines = PipelineInstance.filter([["components", "like", "%#{@object.uuid}%"]]).each do |pipeline| %>
+  <% pipelines = PipelineInstance.limit(5).filter([["components", "like", "%#{@object.uuid}%"]]) %>
+  <%
+    message = "This collection was the output of the following:"
+    if pipelines.items_available > pipelines.results.size
+      message += ' (' + (pipelines.items_available - pipelines.results.size).to_s + ' more results are not shown)'
+    end
+  %>
+  <p><i><%= message %></i><br />
+    <% pipelines.each do |pipeline| %>
       <% pipeline.components.each do |cname, c| %>
         <% if c[:output_uuid] == @object.uuid %>
           <b><%= cname %></b> component of <b><%= link_to_if_arvados_object(pipeline, friendly_name: true) %></b>
@@ -25,7 +32,7 @@
 <% if @log_of.andand.any? %>
   <p><i>This collection contains log messages from:</i><br />
     <%= render_arvados_object_list_start(@log_of, 'Show all jobs',
-                                         jobs_path(filters: [['log', '=', @object.uuid]].to_json)) do |job| %>
+                                         jobs_path(filters: [['log', '=', @object.portable_data_hash]].to_json)) do |job| %>
       <%= link_to_if_arvados_object(job, friendly_name: true) %><br />
     <% end %>
   </p>

diff --git a/apps/workbench/test/integration_performance/collections_perf_test.rb b/apps/workbench/test/integration_performance/collections_perf_test.rb
index 2e80cd7b4561a1ce875e9b311fe8978178c0c0a5..575a0a9715f87e352a4e67f8c1eb96f4bb42b3a9 100644 (file)
--- a/apps/workbench/test/integration_performance/collections_perf_test.rb
+++ b/apps/workbench/test/integration_performance/collections_perf_test.rb
@@ -1,10 +1,15 @@
 require 'integration_helper'
 
+# The tests in the "integration_performance" dir are not included in regular
+#   build pipeline since it is not one of the "standard" test directories.
+#
+# To run tests in this directory use the following command:
+# ./run-tests.sh WORKSPACE=~/arvados --only apps/workbench apps/workbench_test="TEST=test/integration_performance/*.rb"
+#
+
 class CollectionsPerfTest < ActionDispatch::IntegrationTest
   setup do
     Capybara.current_driver = :rack_test
-
-    skip "ENV variable RUN_INTG_PERF_TESTS with value 'y' is not found" if !ENV["RUN_INTG_PERF_TESTS"].andand.start_with? 'y'
   end
 
   def create_large_collection size, file_name_prefix