Fix Agent 6 & 7 install from beta repositories #42
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
albertvaka
reviewed
Nov 19, 2019
| @@ -29,7 +29,7 @@ | |||
| {%- set latest_agent_version = true %} | |||
| {%- else %} | |||
| {%- set latest_agent_version = false %} | |||
| {%- set parsed_version = datadog_install_settings.agent_version | regex_match('(([0-9]+)\.[0-9]+\.[0-9]+)(?:~(rc|beta)\.([0-9]+-[0-9]+))?') %} | |||
| {%- set parsed_version = datadog_install_settings.agent_version | regex_match('(([0-9]+)\.[0-9]+\.[0-9]+)(?:~(rc|beta)\.([0-9]+))?') %} | |||
There was a problem hiding this comment.
You don't have to specify the additional -1 at the end? I think this was matching that. Maybe it's optional? Then we should make it optional in the regex too.
There was a problem hiding this comment.
We can make it optional, but right now the -1 is automatically appended to the version:
datadog-formula/datadog/install.sls
Lines 55 to 58 in 1817e08
There was a problem hiding this comment.
Ok, let's not make it optional if it breaks things :P
albertvaka
approved these changes
Nov 19, 2019
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Fixes the yum repository path for beta installs (Agent 6 betas are in
beta/6, Agent 7 betas inbeta/7).Fixes the regex which checks if a beta version will be installed (there was a
-[0-9]+too much at the end of the regex). The previous regex would match7.15.0~beta.1-1and not7.15.0~beta.1, which makes the install fail since we add the-1again during the installation (giving7.15.0~beta.1-1-1, which is not an existing version).Motivation
Agent 7 testing.