From 84d8500abb131f93231915c40126c189e69ba4c4 Mon Sep 17 00:00:00 2001 From: Justin Stoller Date: Wed, 20 Mar 2024 14:07:29 -0700 Subject: [PATCH 1/2] (maint) Use production forge for integration tests --- CHANGELOG.mkd | 1 + integration/Rakefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.mkd b/CHANGELOG.mkd index 3408a65ad..af4b24ac5 100644 --- a/CHANGELOG.mkd +++ b/CHANGELOG.mkd @@ -4,6 +4,7 @@ CHANGELOG Unreleased ---------- - 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 diff --git a/integration/Rakefile b/integration/Rakefile index 9a47e9baf..88040dc8f 100644 --- 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 From 9592586806f1d4ad5201755f38efd900212444aa Mon Sep 17 00:00:00 2001 From: Justin Stoller Date: Wed, 20 Mar 2024 14:10:23 -0700 Subject: [PATCH 2/2] (maint) Prepare for 3.16.1 --- CHANGELOG.mkd | 11 ++++++++++- lib/r10k/version.rb | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.mkd b/CHANGELOG.mkd index af4b24ac5..5cf179a60 100644 --- a/CHANGELOG.mkd +++ b/CHANGELOG.mkd @@ -3,12 +3,17 @@ CHANGELOG Unreleased ---------- + + +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) @@ -16,19 +21,23 @@ Unreleased 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/lib/r10k/version.rb b/lib/r10k/version.rb index c71c6e429..67eca680b 100644 --- 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 = '3.16.0' + VERSION = '3.16.1' end