Skip to content

Commit

Permalink
Merge pull request #1377 from nmburgan/maint/main/stop_puppet_service
Browse files Browse the repository at this point in the history
(maint) Stop puppet service during tests
  • Loading branch information
donoghuc authored Mar 20, 2024
2 parents 7408c5b + c3a1768 commit cf022a0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.mkd
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CHANGELOG
Unreleased
----------
- (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
-----
Expand Down
3 changes: 1 addition & 2 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
# This repo is owned by the dumpling team
* @puppetlabs/dumpling
* @puppetlabs/dumpling @puppetlabs/skeletor
3 changes: 3 additions & 0 deletions integration/pre-suite/00_pe_install.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'))

0 comments on commit cf022a0

Please sign in to comment.