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) Allow install task to downlad macos 10.15 #471

Merged
merged 1 commit into from
Apr 2, 2020

Conversation

donoghuc
Copy link
Contributor

Add condintion to allow downloading puppet agent packages from 10.15 repo.

Add condintion to allow downloading puppet agent packages from 10.15 repo.
@donoghuc
Copy link
Contributor Author

I just saw https://github.com/puppetlabs/ci-job-configs/commit/de5120505eef07097be8ba3c9beea07a4b789664#diff-420f83aded712be3e269ac56d953dc18R1325-R1326 was merged. Those acceptance tests have not yet triggered but when they do they will certainly fail without at least this commit. I suspect there will also be some other work making the tests not fail due to not having a puppet 5 version to upgrade from

puppet_5_version = case target_platform
when %r{fedora-29}
'5.5.10'
when %r{fedora-30}
'5.5.16'
when %r{fedora-31}
'5.5.18'
else
'5.5.3'
end

@donoghuc donoghuc requested review from a team February 26, 2020 19:57
@nicklewis
Copy link
Contributor

There has to be a better way!

I wonder if it would be possible to make the module look where it expects the file to be and fail if it's not there, rather than continue to update it with new whitelists...

@puppetcla
Copy link

CLA signed by all contributors.

donoghuc added a commit to donoghuc/bolt that referenced this pull request Feb 27, 2020
…10.15

Until we find a solution for puppetlabs/puppetlabs-puppet_agent#471 , adding macos catalina will not work for agent dependent acceptance tests. Also note we no longer build and test for 10.11.
donoghuc added a commit to donoghuc/bolt that referenced this pull request Feb 27, 2020
…10.15

Until we find a solution for puppetlabs/puppetlabs-puppet_agent#471 , adding macos catalina will not work for agent dependent acceptance tests. Also note we no longer build and test for 10.11.
@@ -176,6 +176,7 @@ if [ -f "$PT__installdir/facts/tasks/bash.sh" ]; then
"10.12") platform_version="10.12";;
"10.13") platform_version="10.13";;
"10.14") platform_version="10.14";;
"10.15") platform_version="10.15";;
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe check if major_version matches 10\.1[1-9] (to be on the safe side at least), then pass it on as is? We would get an uglier error when curl-ing the package but the file wouldn't need to be changed for each macOS release.

@GabrielNagy GabrielNagy merged commit 4040daf into puppetlabs:master Apr 2, 2020
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