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.

Sign up for GitHub

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

Fix source install for integrations base pkg name change #3738

Merged
merged 2 commits into from
May 11, 2018
Merged

Fix source install for integrations base pkg name change #3738

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44e20d2
[source install] Fix changes in integrations-core 5.24.0
olivielpeau May 11, 2018
e0cab29
Fix bashisms
olivielpeau May 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions packaging/datadog-agent/source/setup_agent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,8 +453,9 @@ elif check_version $PRE_SDK_RELEASE $AGENT_VERSION; then
print_console "* Setting up integrations"
INTEGRATIONS=$(ls $DD_HOME/integrations/)

# Install `datadog-checks-base` dependency before any checks
cd "$DD_HOME/integrations/datadog-checks-base"
# Install `datadog_checks_base` dependency before any checks
# Handle both old (`-`) and new (`_`) names
cd "$DD_HOME/integrations/datadog_checks_base" || cd "$DD_HOME/integrations/datadog-checks-base"
if [ -f "requirements.in" ]; then
"$DD_HOME/agent/utils/pip-allow-failures.sh" "requirements.in"
elif [ -f "requirements.txt" ]; then
Expand All @@ -464,8 +465,8 @@ elif check_version $PRE_SDK_RELEASE $AGENT_VERSION; then
cd -

for INT in $INTEGRATIONS; do
if [[ "$INT" == "datadog-checks-base" ]]; then continue; fi
if [[ "$INT" == "sqlserver" ]]; then continue; fi
if [ "$INT" = "datadog_checks_base" -o "$INT" = "datadog-checks-base" ]; then continue; fi
if [ "$INT" = "sqlserver" ]; then continue; fi

INT_DIR="$DD_HOME/integrations/$INT"
# Only take into account directories with a `manifest.json` file
Expand Down