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

(BKR-831) added dynamic puppet-agent version read from master #19

Merged
merged 3 commits into from
Dec 19, 2016

Conversation

kevpl
Copy link
Contributor

@kevpl kevpl commented Aug 5, 2016

No description provided.

@puppetlabs-jenkins
Copy link
Contributor

Refer to this link for build results (access rights to CI server needed):
http://jenkins-beaker.delivery.puppetlabs.net//job/qe_beaker-pe_btc-intn/49/

@kevpl
Copy link
Contributor Author

kevpl commented Aug 8, 2016

@puppetlabs/beaker ready for review!

# @param [Hash{Symbol=>String}] local_options local method options hash
#
# @return [String] puppet-agent version to install
def get_puppet_agent_version(host, local_options={})
Copy link
Contributor

Choose a reason for hiding this comment

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

A few comments here, not all that need to be addressed in this PR:

  1. We continue to call things puppet_* when we really mean AIO. We should really figure out a way to clean that so that we can say what we mean. </end rant>

  2. This method uses the aio_agent_build key that puppet facts returns; from what I can tell, we actually want to use aio_agent_version that is identical to aio_agent_build except for it doesn't contain the git sha for the version number.
    Example build: "aio_agent_build": "1.5.3.245.g9bd94ac"
    Example version: "aio_agent_version": "1.5.3.245"

My understanding is that we could use the AIO version to build a path to the tarballs to download; I'm unclear on how we would use the build number in this way.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@tvpartytonight for your first point, I think we're somewhat inconsistent for sure about the terms. I think it's fair to say that puppet_agent is a container term that would hold all instances of aio as well as agents outside of aio, so it's used when we want to be a little more general than that. But we haven't been 100% about that, because the installers that were added for aio when that was going down were all called puppet_agent as well. Since we're coming closer and closer to EOL'ing the 3.8 series from before aio came out that this distinction is becoming less and less meaningful, however, so I'm fine just letting it fall away naturally. But it would be good to have a more explicit label on these things so I'm open to moving. Unfortunately the challenge to that has always been changing signatures and hence the API, but perhaps we can get around that with other methods.

For your second comment, I've done a little looking, and commented on this asking @jpartlow for more info in the ticket. Hopefully we can resolve that there, and figure out what the right move is for this code.

@kevpl
Copy link
Contributor Author

kevpl commented Aug 17, 2016

do not merge, as there's conversation in the ticket that needs to be resolved before this happens

@kevpl kevpl force-pushed the bkr831_install_windows branch from 6861269 to 7a0884f Compare September 12, 2016 18:28
@kevpl
Copy link
Contributor Author

kevpl commented Sep 12, 2016

@tvpartytonight, the comments in the ticket make it seem that _build is the correct property, as hashes are included in the filenames. I've rebased the changes, so I believe they're ready to be looked at again!

@puppetlabs-jenkins
Copy link
Contributor

Refer to this link for build results (access rights to CI server needed):
http://jenkins-beaker.delivery.puppetlabs.net//job/qe_beaker-pe_btc-intn/62/

@kevpl
Copy link
Contributor Author

kevpl commented Sep 14, 2016

um, couldn't find beaker on our mirror? :trollface: 🏆

@puppetlabs-jenkins retest this please

@puppetlabs-jenkins
Copy link
Contributor

Refer to this link for build results (access rights to CI server needed):
http://jenkins-beaker.delivery.puppetlabs.net//job/qe_beaker-pe_btc-intn/63/

@kevpl
Copy link
Contributor Author

kevpl commented Sep 16, 2016

@puppetlabs-jenkins retest this please

@puppetlabs-jenkins
Copy link
Contributor

Refer to this link for build results (access rights to CI server needed):
http://jenkins-beaker.delivery.puppetlabs.net//job/qe_beaker-pe_btc-intn/72/

@tvpartytonight
Copy link
Contributor

@puppetlabs-jenkins retest this please

@puppetlabs-jenkins
Copy link
Contributor

Refer to this link for build results (access rights to CI server needed):
http://jenkins-beaker.delivery.puppetlabs.net//job/qe_beaker-pe_btc-intn/83/

@kevpl kevpl force-pushed the bkr831_install_windows branch from 7a0884f to 0aee1cb Compare September 19, 2016 21:47
@puppetlabs-jenkins
Copy link
Contributor

Refer to this link for build results (access rights to CI server needed):
http://jenkins-beaker.delivery.puppetlabs.net//job/qe_beaker-pe_btc-intn/85/

@puppetlabs-jenkins
Copy link
Contributor

Refer to this link for build results (access rights to CI server needed):
http://jenkins-beaker.delivery.puppetlabs.net//job/qe_beaker-pe_btc-intn/109/

@kevpl
Copy link
Contributor Author

kevpl commented Nov 14, 2016

@puppetlabs-jenkins retest this please

@puppetlabs-jenkins
Copy link
Contributor

Refer to this link for build results (access rights to CI server needed):
http://jenkins-beaker.delivery.puppetlabs.net//job/qe_beaker-pe_btc-intn/132/

@kevpl kevpl force-pushed the bkr831_install_windows branch from 0aee1cb to 2e6d782 Compare November 14, 2016 18:43
@kevpl
Copy link
Contributor Author

kevpl commented Nov 14, 2016

Got weird results w/really old versions of beaker-pe, etc. suspect that it has something to do with the PR being old and targeted to pre-1.0 beaker-pe. Rebased & re-pushed. We'll see what that does to the test results when they're auto-kicked.

@puppetlabs-jenkins
Copy link
Contributor

Refer to this link for build results (access rights to CI server needed):
http://jenkins-beaker.delivery.puppetlabs.net//job/qe_beaker-pe_btc-intn/133/

@kevpl
Copy link
Contributor Author

kevpl commented Nov 14, 2016

@puppetlabs/beaker @mwbutcher review?

# before the agents
facts_result = on(master, 'puppet facts')
facts_hash = JSON.parse(facts_result.stdout.chomp)
puppet_agent_version = facts_hash['values']['aio_agent_build']
Copy link
Contributor

Choose a reason for hiding this comment

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

For released versions of Puppetserver, it looks like there isn't an aio_agent_build value, just an aio_agent_version. It seems like this will be a problem when trying to install released versions? I'm unclear though, as there might be logic I am missing that only allows this code path to execute if we know we have a development build...

Gist with relevant info.

@kevpl kevpl force-pushed the bkr831_install_windows branch from 2e6d782 to 6727879 Compare December 2, 2016 22:50
@puppetlabs-jenkins
Copy link
Contributor

Refer to this link for build results (access rights to CI server needed):
http://jenkins-beaker.delivery.puppetlabs.net//job/qe_beaker-pe_btc-intn/137/

@kevpl
Copy link
Contributor Author

kevpl commented Dec 5, 2016

spec tests are failing due to unrelated work. The fix has been submitted in #42. This work can wait for that change and rebase to get green for merging.

@kevpl kevpl force-pushed the bkr831_install_windows branch from 6727879 to d42ef8e Compare December 13, 2016 16:34
@puppetlabs-jenkins
Copy link
Contributor

Refer to this link for build results (access rights to CI server needed):
http://jenkins-beaker.delivery.puppetlabs.net//job/qe_beaker-pe_btc-intn/139/

@smcelmurry
Copy link
Contributor

👍 LGTM

@smcelmurry smcelmurry merged commit 415d3f3 into puppetlabs:master Dec 19, 2016
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