(BOLT-742) Add support for collections to install task #312
Conversation
This comment has been minimized.
This comment has been minimized.
|
'puppet' implicitly maps to latest (according to our release team). If you want a specific collection, I'd choose one, so I don't want to consider updating 'latest' to a new collection to be breaking. Also, what would 'null' mean in terms of 'collection'? |
|
I'm not very convinced we need to support PC1. It's no longer developed and it introduces lots of special cases. |
|
Removed PC1 support. |
|
I didn't realize puppet was a thing on our release servers. +1 |
| results = run_task_on('target', 'puppet_agent::version') | ||
| results.each do |res| | ||
| expect(res['status']).to eq('success') | ||
| expect(res['result']['version']).to eq('5.5.2') |
There was a problem hiding this comment.
For some reason there is no 5.5.2 for windows in either puppet or puppet5 collections. This will fail the windows acceptance tests. Same for osx 10.11. Unfortunately there does not seem to be a common version for all the different targets in our nodeset.
There was a problem hiding this comment.
Looks like 5.5.2 was burned. I’ll update to 5.5.3.
| @@ -419,8 +417,7 @@ install_file() { | |||
| info "installing puppetlabs dmg with hdiutil and installer" | |||
| mountpoint="$(mktemp -d -t $(random_hexdump))" | |||
| /usr/bin/hdiutil attach "${download_filename?}" -nobrowse -readonly -mountpoint "${mountpoint?}" | |||
| latest_macos_version $mountpoint | |||
| /usr/sbin/installer -pkg "${mountpoint?}/puppet-agent-${dmg_version?}-installer.pkg" -target / | |||
| /usr/sbin/installer -pkg ${mountpoint?}/puppet-agent-*-installer.pkg -target / | |||
There was a problem hiding this comment.
Using the wildcard to match version in .pkg path is brilliant. Wish I would have thought of that!
There was a problem hiding this comment.
This change is only needed for PC1 packages. But it seems reasonable enough.
| "parameters": { | ||
| "version": { | ||
| "description": "The version of puppet-agent to install", | ||
| "type": "Optional[String]" | ||
| }, | ||
| "collection": { | ||
| "description": "The Puppet collection to install from (defaults to puppet, which maps to the latest collection released)", |
There was a problem hiding this comment.
Should the description be ... maps to the latest release in the puppet collection? I interpret latest collection released to mean the latest version in any collection. Maybe this is intentional?
There was a problem hiding this comment.
puppet maps to puppet5 now, will switch to puppet6 once released. So open to anything to clarify that.
There was a problem hiding this comment.
I just assumed that latest would mean latest in the collection. Should have tested before commenting. I think your description is clear as is.
Adds a collections parameter that defaults to 'puppet'. Available values - 'puppet5' - 'puppet6', for future support when it's released - 'puppet', aliases to the latest available collection Install will select either the latest version from that collection, or only work if you provide a valid version within that collection. To install versions outside the default collection you'll need to explicitly specify the collection and version.
|
Updated to 5.5.3. |
Adds a collections parameter that defaults to 'puppet'. Available values
Install will select either the latest version from that collection, or
only work if you provide a valid version within that collection. To
install versions outside the default collection you'll need to
explicitly specify the collection and version.