Don't require APM to enable datadog-installer #588
Merged
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
chouquette
force-pushed
the
chouquette/enable_installer
branch
3 times, most recently
from
02fa5a4
to
3982874
Compare
chouquette
force-pushed
the
chouquette/enable_installer
branch
from
3982874
to
a7999a4
Compare
And use it to enable the installer installation
chouquette
force-pushed
the
chouquette/enable_installer
branch
8 times, most recently
from
f8de2d2
to
faf8566
Compare
chouquette
force-pushed
the
chouquette/enable_installer
branch
from
faf8566
to
f200ce8
Compare
AliDatadog
reviewed
Jul 31, 2024
.circleci/config.yml
Outdated
| - run: ANSIBLE_JINJA2_NATIVE="<<parameters.jinja2_native>>" ansible-playbook -i ./ci_test/inventory/<<parameters.inventory>> "./ci_test/install_installer.yaml" | ||
| - run: datadog-installer version | ||
| - run: ANSIBLE_JINJA2_NATIVE="<<parameters.jinja2_native>>" ansible-playbook -i ./ci_test/inventory/<<parameters.inventory>> "./ci_test/install_installer.yaml" -e datadog_apm_instrumentation_enabled="<<parameters.apm_enabled>>" -e datadog_remote_updates="<<parameters.remote_updates>>" | ||
| - run: bash -c 'if [ -n "<<parameters.apm_enabled>>" ] || [ "<<parameters.remote_updates>>" = "true" ]; then datadog-installer version; elif command -v datadog-installer; then echo datadog-installer should not be installed; exit 2; else echo datadog-installer is not installed as expected; fi' |
There was a problem hiding this comment.
nit: I am not sure we need datadog-installer is not installed as expected and I am a bit curious about whether it's possible to have smaller lines
There was a problem hiding this comment.
agreed on the line size, this is handled in a follow up PR: 3a07803
Although as it's currently kind of blocked, I'll cherry pick it here
Regarding the echo ... as expected this was to avoid having a large chunk of shell script being displayed with no insight, I find it a bit reassuring to have the test job saying what failed/succeeded
AliDatadog
approved these changes
Jul 31, 2024
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.
This PR allows the datadog-installer to be enabled trough a new
remote_updatesvariable