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 puppet5 install logic #24

Merged
merged 3 commits into from
Jan 5, 2018
Merged

(maint) Refactor puppet5 install logic #24

merged 3 commits into from
Jan 5, 2018

Conversation

joshcooper
Copy link
Contributor

This is blocked on #23

Previously the if/elsif block set onhost_package_file for some, but not
all hosts. Then a second if/elsif block called different install methods
based on the platform variant and the above variable.

This commit uses a single case/when statement to branch. It makes it
clearer that EOS calls install_from_file, OSX uses the single argument
version of install_local_package, while Solaris uses the two argument
version. Also Windows uses a different installation method entirely.

On Windows, the "install_from_build_data_url" method was trying to
install the artifact as a cygwin package which won't work for MSIs.
Instead use the beaker method for installing as an MSI. Note the
"install_msi_on" method is specific to the puppet-agent package, because
it will ensure the puppet service is stopped before installing and will
install it as a Manual service. In the future we may want to
differentiate between the puppet-agent project and others, and use
"generic_install_msi_on" for the latter.
Previously the if/elsif block set onhost_package_file for some, but not
all hosts. Then a second if/elsif block called different install methods
based on the platform variant and the above variable.

This commit uses a single case/when statement to branch. It makes it
clearer that EOS calls install_from_file, OSX uses the single argument
version of install_local_package, while Solaris uses the two argument
version. Also Windows uses a different installation method entirely.
@puppetlabs-jenkins
Copy link
Contributor

Can one of the admins verify this patch?

@kevpl
Copy link
Contributor

kevpl commented Jan 5, 2018

👍 will kick testing once #23 is merged, then we should be good to merge & release

@kevpl
Copy link
Contributor

kevpl commented Jan 5, 2018

@puppetlabs-jenkins test this please

@kevpl kevpl merged commit ea38b08 into master Jan 5, 2018
@joshcooper joshcooper deleted the refactor-puppet5 branch January 5, 2018 23:14
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.

4 participants