-
Notifications
You must be signed in to change notification settings - Fork 191
Exclude system testing gems from main Gemfile #831
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| source ENV['GEM_SOURCE'] || "https://rubygems.org" | ||
|
|
||
| # Find a location or specific version before installing a gem | ||
| # | ||
| # @param place_or_version can be one of: | ||
| # - A specific version, | ||
| # - A git branch, as `https://<your-repo>.git#<branch-name>` | ||
| # - A file URI, as `file:///absolute/file/path` | ||
| def location_for(place, fake_version = nil) | ||
| if place.is_a?(String) && place =~ /^((?:git[:@]|https:)[^#]*)#(.*)/ | ||
| [fake_version, { git: $1, branch: $2, require: false }].compact | ||
| elsif place.is_a?(String) && place =~ /^file:\/\/(.*)/ | ||
| ['>= 0', { path: File.expand_path($1), require: false }] | ||
| else | ||
| [place, { require: false }] | ||
| end | ||
| end | ||
|
|
||
| gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 6') | ||
| gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 1') | ||
| gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || '~> 2') | ||
| gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 4') | ||
| gem "beaker-module_install_helper", require: false | ||
| gem "beaker-puppet_install_helper", require: false | ||
| gem "beaker-task_helper", '~>1.9' if ENV['GEM_BOLT'] | ||
| gem "puppetlabs_spec_helper", '~> 8.0', require: false | ||
| gem "voxpupuli-acceptance", '~> 3', require: false | ||
| gem "puppet_litmus", '~> 2.0', require: false, platforms: [:ruby, :x64_mingw] |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are we going to manually update the main Gemfile instead of relying on the PDK moving forward? Or was the intent to just remove the testing-related gems?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Once the litmus -> pdk -> r10k -> puppet_forge -> faraday 1.x dependency chain is broken, I'm hoping we can re-enable managing the Gemfile and just ignore the
system_testgroup. Meanwhile beaker related dependencies can continue to live inacceptance/Gemfileandtask_spec/Gemfile. And eventually maybe we can collapse the parallel beaker tests for manifest and tasks into a single acceptance directory/Gemfile.