From ab74e1b5f5d3a92475aaa4492c8e6fa12d76fc55 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Tue, 26 Jun 2018 20:55:07 -0700 Subject: Remove the existing acceptance testing framework We haven't used this framework for 2 major releases of Chef and as time goes on it's more and more likely we'll build something very different for testing. We 100% do need acceptance testing, but between dokken testing in Travis and the potential for more complex integration testing with build-kite I think we should do the proper cleanup and remove this code now. Signed-off-by: Tim Smith --- tasks/dependencies.rb | 2 -- 1 file changed, 2 deletions(-) (limited to 'tasks/dependencies.rb') diff --git a/tasks/dependencies.rb b/tasks/dependencies.rb index a66e166d92..93b357af82 100644 --- a/tasks/dependencies.rb +++ b/tasks/dependencies.rb @@ -40,7 +40,6 @@ namespace :dependencies do task :update_ci => %w{ dependencies:update_gemfile_lock dependencies:update_omnibus_gemfile_lock - dependencies:update_acceptance_gemfile_lock dependencies:update_audit_tests_berksfile_lock } @@ -83,7 +82,6 @@ namespace :dependencies do bundle_update_locked_multiplatform_task :update_gemfile_lock, "." bundle_update_locked_multiplatform_task :update_omnibus_gemfile_lock, "omnibus" - bundle_update_task :update_acceptance_gemfile_lock, "acceptance" berks_update_task :update_audit_tests_berksfile_lock, "kitchen-tests/cookbooks/audit_test" end -- cgit v1.2.1 From 35603c7ce1bd3ccf35334ed65152140f0ecaf080 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Mon, 2 Jul 2018 10:25:16 -0700 Subject: fix Style/HashSyntax Signed-off-by: Lamont Granquist --- tasks/dependencies.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tasks/dependencies.rb') diff --git a/tasks/dependencies.rb b/tasks/dependencies.rb index 93b357af82..12beab9808 100644 --- a/tasks/dependencies.rb +++ b/tasks/dependencies.rb @@ -37,7 +37,7 @@ namespace :dependencies do # Update all dependencies to the latest constraint-matching version desc "Update all dependencies. dependencies:update to update as little as possible (CI-only)." - task :update_ci => %w{ + task update_ci: %w{ dependencies:update_gemfile_lock dependencies:update_omnibus_gemfile_lock dependencies:update_audit_tests_berksfile_lock @@ -87,6 +87,6 @@ namespace :dependencies do end desc "Update all dependencies and check for outdated gems." -task :dependencies_ci => [ "dependencies:update_ci" ] -task :dependencies => [ "dependencies:update" ] -task :update => [ "dependencies:update" ] +task dependencies_ci: [ "dependencies:update_ci" ] +task dependencies: [ "dependencies:update" ] +task update: [ "dependencies:update" ] -- cgit v1.2.1 From 0bdd618fc5146dad3fa5a90d10a4b5e608e4663d Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Mon, 2 Jul 2018 10:32:45 -0700 Subject: fix Style/UnneededInterpolation Signed-off-by: Lamont Granquist --- tasks/dependencies.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tasks/dependencies.rb') diff --git a/tasks/dependencies.rb b/tasks/dependencies.rb index 12beab9808..562ec50b81 100644 --- a/tasks/dependencies.rb +++ b/tasks/dependencies.rb @@ -25,14 +25,14 @@ namespace :dependencies do desc "Update all dependencies. dependencies:update to update as little as possible." task :update do |t, rake_args| # FIXME: probably broken, and needs less indirection - system("#{File.join(Dir.pwd, "ci", "dependency_update.sh")}") + system((File.join(Dir.pwd, "ci", "dependency_update.sh")).to_s) end desc "Force update (when adding new gems to Gemfiles)" task :force_update do |t, rake_args| # FIXME: probably broken, and needs less indirection FileUtils.rm_f(File.join(Dir.pwd, ".bundle", "config")) - system("#{File.join(Dir.pwd, "ci", "dependency_update.sh")}") + system((File.join(Dir.pwd, "ci", "dependency_update.sh")).to_s) end # Update all dependencies to the latest constraint-matching version -- cgit v1.2.1