Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Use beaker-hiera to reduce duplication #699

Merged
merged 1 commit into from
May 4, 2020
Merged

Use beaker-hiera to reduce duplication #699

merged 1 commit into from
May 4, 2020

Conversation

ekohl
Copy link
Member

@ekohl ekohl commented Dec 16, 2018

No description provided.

@mmoll
Copy link
Contributor

mmoll commented Dec 16, 2018

@ekohl needs a rebase

@mmoll
Copy link
Contributor

mmoll commented Dec 16, 2018

@ekohl now it needs fixing ;)

@ekohl ekohl changed the title [WIP] Refactor acceptance testing + class inclusion Refactor acceptance testing Dec 16, 2018
@ekohl
Copy link
Member Author

ekohl commented Dec 16, 2018

I'll look into using hiera for some variables. This also has the issue that a modulesync would overwrite it, but it's cleaner in the mean time.

@ekohl
Copy link
Member Author

ekohl commented Dec 17, 2018

I've gone a bit further to clean it up. It does divert from modulesync and I've used my own fork of beaker-hiera (which should actually be part of beaker-puppet, but that code was lost in the beaker 4 migration). I'm going to work in integrating the right pieces in the right projects, but it removes all workarounds from the examples and really to the point.

@ekohl ekohl changed the title Refactor acceptance testing [WIP] Refactor acceptance testing Jan 10, 2019
@theforeman-bot
Copy link
Member

@ekohl, this pull request is currently not mergeable. Please rebase against the master branch and push again.

If you have a remote called 'upstream' that points to this repository, you can do this by running:

    $ git pull --rebase upstream master

This message was auto-generated by Foreman's prprocessor

@ekohl ekohl mentioned this pull request Mar 6, 2020
Closed
@ekohl ekohl changed the title [WIP] Refactor acceptance testing Refactor acceptance testing Mar 6, 2020
@ekohl ekohl force-pushed the simplify-acceptance branch 2 times, most recently from 4fe64cc to 71fd841 Compare March 6, 2020 18:54
@ekohl
Copy link
Member Author

ekohl commented Mar 6, 2020

💚 now.

ekohl
ekohl commented Mar 6, 2020
View reviewed changes
Gemfile
@@ -29,6 +29,7 @@ gem 'puppet-blacksmith', '>= 4.1.0', {"groups"=>["development"]}
gem 'beaker', '>= 4.2.0', {"groups"=>["system_tests"]}
gem 'beaker-docker', {"groups"=>["system_tests"]}
gem 'beaker-hostgenerator', '>= 1.1.10', {"groups"=>["system_tests"]}
gem 'beaker-hiera', {"git"=>"https://github.com/ekohl/beaker-hiera", "branch"=>"fix", "groups"=>["system_tests"]}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure how to deal with this. I'll start nagging to get the upstream repo un-achived and the fix merged

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd say this is OK, as it's "only" about testing.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, let's accept this for now. There is talk about moving beaker from puppetlabs to Voxpupuli at which point I can solve it cleanly.

ekohl
ekohl commented Mar 6, 2020
View reviewed changes
spec/acceptance/hieradata/os/RedHat/7.yaml
@@ -0,0 +1,2 @@
---
redis::globals::scl: rh-redis5
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also switch to PG 12 while we're at it?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm actually a bit surprised, this still works without it ;)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to include this now.

ekohl
ekohl commented Mar 6, 2020
View reviewed changes
spec/spec_helper_acceptance.rb Outdated Show resolved Hide resolved
@ekohl ekohl marked this pull request as draft April 16, 2020 15:03
@ekohl ekohl mentioned this pull request Apr 17, 2020
Merged
@ekohl
Copy link
Member Author

ekohl commented Apr 20, 2020

Include #827 now. Keeping it in draft due to beaker-hiera. It's also hard to combine with #823 now.

@ekohl ekohl mentioned this pull request Apr 23, 2020
Merged
@ekohl
Copy link
Member Author

ekohl commented Apr 23, 2020

#829 takes everything except the hiera bits since I'm still unsure about the gem. It's also incompatible with modulesync.

@ekohl ekohl marked this pull request as ready for review April 23, 2020 17:19
@ekohl
Copy link
Member Author

ekohl commented Apr 23, 2020

There's talk of beaker moving to Voxpupuli and that would allow me to merge it and deal with it properly. I think this is a good thing in the meanwhile to merge since it cleans up things.

@ekohl ekohl changed the title Refactor acceptance testing Use beaker-hiera to reduce duplication Apr 23, 2020
@ekohl ekohl mentioned this pull request May 4, 2020
Merged
@ekohl
Use hiera in acceptance tests
d20f1e6 
This removes duplication from the examples and allows it to only show
what's really needed. It currently relies on my git fork of beaker-hiera
since that's archived.

It also updates to PostgreSQL 12 on EL7 since Rails 6 now needs that.
@ekohl
Copy link
Member Author

ekohl commented May 4, 2020

Rebased and updated to use PG 12 from SCL on EL7.

@mmoll mmoll merged commit 2e241f3 into theforeman:master May 4, 2020
@mmoll
Copy link
Contributor

mmoll commented May 4, 2020

merged, bedankt @ekohl!

@ekohl ekohl deleted the simplify-acceptance branch May 4, 2020 16:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mmoll mmoll mmoll left review comments

Assignees
No one assigned
Labels
Needs re-review Needs testing skip-changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ekohl @mmoll @theforeman-bot @ehelms