Skip to content

Commit

Permalink
Merge pull request #1375 from justinstoller/test-forge
Browse files Browse the repository at this point in the history
(maint) Use production forge for integration tests
  • Loading branch information
justinstoller authored Mar 20, 2024
2 parents e5be03b + 9592586 commit 9725e26
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
12 changes: 11 additions & 1 deletion CHANGELOG.mkd
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,41 @@ CHANGELOG

Unreleased
----------
- Make metadata loading during incremental deploys more robust [PE-34917](https://perforce.atlassian.net/browse/PE-34917)


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)

Expand Down
2 changes: 1 addition & 1 deletion integration/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion lib/r10k/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 9725e26

Please sign in to comment.