Merge branch 'puppetlabs:main' into fetch_tags

puppetlabs · Apr 9, 2024 · 3070e72 · 3070e72
2 parents d6ae45d + 04b594d
commit 3070e72
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 6 deletions.
diff --git a/CHANGELOG.mkd b/CHANGELOG.mkd
@@ -4,6 +4,14 @@ CHANGELOG
 Unreleased
 ----------
 
+4.0.2
+-----
+
+- Make metadata loading during incremental deploys more robust [PE-34917](https://perforce.atlassian.net/browse/PE-34917)
+- Use the production forge for integration testing
+- (maint) Update beaker-pe to 3 [#1376](https://github.com/puppetlabs/r10k/pull/1376)
+- (maint) Stop puppet service during tests [#1377](https://github.com/puppetlabs/r10k/pull/1377)
+
 4.0.1
 -----
 
@@ -20,28 +28,39 @@ Unreleased
 - (RK-386) Remove deprecated `bare` environment type. [#1235](https://github.com/puppetlabs/r10k/issues/1235)
 
 
+3.16.1
+------
+
+- Make metadata loading during incremental deploys more robust [PE-34917](https://perforce.atlassian.net/browse/PE-34917)
+- Use the production forge for integration testing
+
 3.16.0
 ------
+
 - Emit more debug output when modules fail to sync [#1347](https://github.com/puppetlabs/r10k/pull/1347)
 - Update GitHub Actions & introduce dependabot [#1337](https://github.com/puppetlabs/r10k/pull/1337)
 - Update R10K proxy usage to follow newer rugged best practices [PE-35980](https://tickets.puppet.com/browse/PE-35980)
 - Update Acceptance tests to be compatible with Puppet 8 [#1349](https://github.com/puppetlabs/r10k/pull/1349)
 
 3.15.4
 ------
+
 - Pin dependencies to maintain support for old Ruby versions [#1329](https://github.com/puppetlabs/r10k/pull/1329)
 
 3.15.3
 ------
+
 - Fix dirty working copy debug logging [#1321](https://github.com/puppetlabs/r10k/pull/1321)
 - Allow gettext-setup < 2 for compatibility with Ruby 3.2 and Puppet 8 [#1325](https://github.com/puppetlabs/r10k/pull/1325)
 
 3.15.2
 ------
+
 - Implement exclude regex for puppetfile install [#1248](https://github.com/puppetlabs/r10k/issues/1248)
 
 3.15.1
 ------
+
 - Add TOC to configuration docs [#1298](https://github.com/puppetlabs/r10k/issues/1298)
 - Remove the spec folder from gemspec [#1316](https://github.com/puppetlabs/r10k/issues/1316)
 

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,2 +1 @@
-# This repo is owned by the dumpling team
-* @puppetlabs/dumpling
+* @puppetlabs/dumpling @puppetlabs/skeletor
diff --git a/integration/Gemfile b/integration/Gemfile
@@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
 end
 
 gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 4.5')
-gem 'beaker-pe', '~> 2.0'
+gem 'beaker-pe', '~> 3.0'
 gem 'beaker-answers'
 gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || '~> 1.1')
 gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.4')

diff --git a/integration/Rakefile b/integration/Rakefile
@@ -69,7 +69,7 @@ rototiller_task :beaker_hostgenerator do |t|
     # This is a hack :(
     t.add_flag(:name => '', :default => 'centos7-64mdca-64.fa', :override_env => 'TEST_TARGET')
 
-    t.add_flag(:name => '--global-config', :default => '{forge_host=forge-aio01-petest.puppetlabs.com}', :override_env => 'BHG_GLOBAL_CONFIG')
+    t.add_flag(:name => '--global-config', :default => '{forge_host=forgeapi.puppet.com}', :override_env => 'BHG_GLOBAL_CONFIG')
   end
 end
 

diff --git a/integration/pre-suite/00_pe_install.rb b/integration/pre-suite/00_pe_install.rb
@@ -4,3 +4,6 @@
 
 step 'Install PE'
 install_pe
+
+step 'Stop puppet service to avoid running into existing agent runs'
+on(hosts, puppet('resource service puppet ensure=stopped'))
diff --git a/lib/r10k/module_loader/puppetfile.rb b/lib/r10k/module_loader/puppetfile.rb
@@ -104,8 +104,11 @@ def load_metadata!
         @existing_module_versions_by_name = @existing_module_metadata.map {|mod| [ mod.name, mod.version ] }.to_h
         empty_load_output.merge(modules: @existing_module_metadata)
 
-      rescue SyntaxError, LoadError, ArgumentError, NameError => e
+      rescue ScriptError, StandardError => e
         logger.warn _("Unable to preload Puppetfile because of %{msg}" % { msg: e.message })
+
+        @existing_module_metadata = []
+        @existing_module_versions_by_name = {}
       end
 
       def add_module_metadata(name, info)

diff --git a/lib/r10k/version.rb b/lib/r10k/version.rb
@@ -2,5 +2,5 @@ module R10K
   # When updating to a new major (X) or minor (Y) version, include `#major` or
   # `#minor` (respectively) in your commit message to trigger the appropriate
   # release. Otherwise, a new patch (Z) version will be released.
-  VERSION = '4.0.1'
+  VERSION = '4.0.2'
 end