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.

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

(maint) refactor acceptance rakefile and options files #1094

Merged
merged 1 commit into from
Dec 19, 2015
Merged

(maint) refactor acceptance rakefile and options files #1094

merged 1 commit into from
Dec 19, 2015

Conversation

er0ck
Copy link

@er0ck er0ck commented Aug 8, 2015

This change contains many changes to the acceptance Rakefile to put most
of the options back in the options files and use new beaker features for
creating preserved_hosts files.
It removes some of the functionality in parsing log files, but this was
all broken by beaker changes anyway. If people need this we can add it back in at that
time.

[skip ci]

@MikaelSmith
Copy link

I just tried be rake ci:test:aio SHA=1.2.2 TEST=tests/no_errors_on_stderr.rb CONFIG=config/nodes/redhat-6-x86_64.yaml and it didn't work with this PR.

@er0ck
Copy link
Author

er0ck commented Aug 10, 2015

thanks @MikaelSmith.

didn't realize i had removed that. probably should be deprecated to match beaker's option deprecation.
fixed...

@MikaelSmith
Copy link

👍 this looks ok to me.

@MikaelSmith
Copy link

I'd vote for some more feedback before merging.

@er0ck
Copy link
Author

er0ck commented Aug 11, 2015

yes, please. @joshcooper if you get a chance, some perspective on this would be great. i'm going to PR something similar against puppet and hiera after this goes through.
later we should probably fix the git method for facter (pull source and build it on the SUT)

the main functionality removed here was to manage hosts for the past 24hours. this functionality did not work with new versions of puppet.
I could make that work better in the Rakefile, but that functionality should probably be built into beaker instead.
eg: https://tickets.puppetlabs.com/browse/BKR-442

@MikaelSmith
Copy link

Needs a rebase now.

@er0ck
Copy link
Author

er0ck commented Aug 17, 2015

@MikaelSmith done.

@MikaelSmith
Copy link

Needs a rebase, and @joshcooper did you have any input?

File.open(preserved_config_path, 'r') do |file|
if file.ctime > yesterday
file.each_line do |line|
matchdata = /(\w+\.delivery\.puppetlabs\.net) \(.*?\)$/.match(line.encode!('UTF-8', 'UTF-8', :invalid => :replace))
Copy link
Contributor

Choose a reason for hiding this comment

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

I would expect the hostname to be US_ASCII, can we drop the encode?

Copy link
Author

Choose a reason for hiding this comment

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

inherited... i forget if this even works.
i can certainly remove the encode.

most of this functionality can/should move to beaker/vmpooler API.
which leads me to investigating a rakefile gem for at least puppet/facter/hiera, and i'd love to jettison the acceptance Rakefile altogether as in other projects.... but i digress

@er0ck
Copy link
Author

er0ck commented Sep 17, 2015

@MikaelSmith done.

@branan
Copy link

branan commented Nov 8, 2015

@er0ck @MikaelSmith It's been six weeks with no activity. Should this be rebased/resurected post-agent-1.3.0?

@er0ck
Copy link
Author

er0ck commented Nov 9, 2015

yeah... i'll refactor this and address josh's concerns this week

This change contains many changes to the acceptance Rakefile to put most
of the options back in the options files and use new beaker features for
creating preserved_hosts files.
It removes some of the functionality in parsing log files, but this was
all broken by beaker changes anyway.

[skip ci]
@er0ck
Copy link
Author

er0ck commented Dec 18, 2015

@MikaelSmith rebased and ready to go.

@MikaelSmith
Copy link

👍 on deleting code. I'll try it out and make sure some workflows still work.

@MikaelSmith
Copy link

This looks ok. I say merge it and see who yells.

On a side note, maybe we should remove the git and package targets unless we expect to make them work.

@er0ck
Copy link
Author

er0ck commented Dec 18, 2015

good idea removing the package options for sure. i don't think we have packages?
the git option we should probably remove under YAGNE rules. can add it back and make it work if we want it.

@kylog
Copy link

kylog commented Dec 19, 2015

Agreed on all counts. Let it rip and see what falls out. Including +1 on removing git/package, since they're bitrotted/obsolete at this point.

MikaelSmith pushed a commit that referenced this pull request Dec 19, 2015
…rakefile_options_files

(maint) refactor acceptance rakefile and options files
@MikaelSmith MikaelSmith merged commit 3d365e6 into puppetlabs:master Dec 19, 2015
@er0ck
Copy link
Author

er0ck commented Dec 19, 2015

FYI, passed in CI after the merge.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants