ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bypass crystalball if changes match config/.*\.rb 

flag=none

Test-plan:
- test with changed config ruby file
- verify yml example files in config/ don't trigger
  complete re-run

Change-Id: Ia11c0c522cf3ab064fe16e140fed2df4414a022c
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/285098
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: James Butters <jbutters@instructure.com>
QA-Review: Brian Watson <bwatson@instructure.com>
Product-Review: Brian Watson <bwatson@instructure.com>
This commit is contained in:
Brian Watson 2022-02-14 14:03:05 -07:00
parent b9d45dbc1d
commit 737d2dc808
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spec/support/crystalball.rb
View File

@ -91,8 +91,7 @@ module Crystalball
attr_writer :config, :prediction_builder
def config_file
file = Pathname.new(ENV.fetch("CRYSTALBALL_CONFIG", "crystalball.yml"))
file = Pathname.new("config/crystalball.yml") unless file.exist?
file = Pathname.new(ENV.fetch("CRYSTALBALL_CONFIG", "config/crystalball.yml"))
file.exist? ? file : nil
end
@ -136,7 +135,7 @@ module Crystalball
super do |p|
p.use Crystalball::Predictor::ModifiedSpecs.new
p.use Crystalball::Predictor::ModifiedExecutionPaths.new
p.use Crystalball::Predictor::NewFiles.new
p.use Crystalball::Predictor::ChangedFiles.new
end
end
end
@ -145,7 +144,7 @@ module Crystalball
class Predictor
# Queues a total re-run if any files are added. If no new files, don't add any predictions
# Possible git operation types for SourceDiff include: ['new', 'modified', 'moved', 'deleted]
class NewFiles
class ChangedFiles
include Helpers::AffectedExampleGroupsDetector
include Strategy
@ -161,15 +160,20 @@ module Crystalball
# Hash["new"] = ["new_file1.rb", "new_file2.rb"]
# Hash["modified"] = ["modified_file1.rb", "modified_file2.rb"]
# etc...
new_files = file_change_types.each_with_object(Hash.new { |h, k| h[k] = [] }) do |arr, change_map|
file_changes = file_change_types.each_with_object(Hash.new { |h, k| h[k] = [] }) do |arr, change_map|
change_path = arr[0]
change_type = arr[1]
change_map[change_type] << change_path
end
if new_files["new"].count.positive?
Crystalball.log :warn, "Crystalball changes: #{file_changes.slice("new", "modified")}"
if file_changes["new"].count.positive?
Crystalball.log :warn, "Crystalball detected new .git files: #{new_files["new"]}"
Crystalball.log :warn, "Crystalball requesting entire suite re-run"
["."]
elsif file_changes["modified"].find { |path| path =~ %r{config/.*.rb$} }
Crystalball.log :warn, "Crystalball detected ruby config/ file changes!"
Crystalball.log :warn, "Crystalball requesting entire suite re-run"
["."]
else
[]
end
@ -178,7 +182,7 @@ module Crystalball
end
end
# Override prediction mechanism based on NewFiles predictor. If we requeue an entire suite re-run
# Override prediction mechanism based on ChangedFiles predictor. If we requeue an entire suite re-run
# ENV["CRYSTALBALL_TEST_SUITE_ROOT"] should point to the root of selenium specs or whatever is deemed
# relevant for a "complete crystalball-predicted run"
class Predictor