From f74cad52b5a9974584519cdda81987d15a527b26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= Date: Wed, 28 Aug 2024 12:16:33 +0200 Subject: [PATCH] switch install script URL to our CF distribution (#28827) --- cmd/agent/install_script.sh | 6 +++--- tasks/kmt.py | 2 +- test/new-e2e/tests/agent-platform/install/install.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/agent/install_script.sh b/cmd/agent/install_script.sh index 27b1b3fb58ee0..04a89fdb615cb 100755 --- a/cmd/agent/install_script.sh +++ b/cmd/agent/install_script.sh @@ -9,9 +9,9 @@ set -e echo -e "\033[33m install_script.sh is deprecated. Please use one of - - * https://s3.amazonaws.com/dd-agent/scripts/install_script_agent6.sh to install Agent 6 - * https://s3.amazonaws.com/dd-agent/scripts/install_script_agent7.sh to install Agent 7 + + * https://install.datadoghq.com/scripts/install_script_agent6.sh to install Agent 6 + * https://install.datadoghq.com/scripts/install_script_agent7.sh to install Agent 7 \033[0m" install_script_version=1.13.0.deprecated diff --git a/tasks/kmt.py b/tasks/kmt.py index 503eb7ea40c6a..993051959ba9a 100644 --- a/tasks/kmt.py +++ b/tasks/kmt.py @@ -2113,7 +2113,7 @@ def install_ddagent( for d in domains: d.run_cmd( ctx, - f"curl -L https://s3.amazonaws.com/dd-agent/scripts/install_script_agent{major}.sh > /tmp/install-script.sh", + f"curl -L https://install.datadoghq.com/scripts/install_script_agent{major}.sh > /tmp/install-script.sh", verbose=verbose, ) d.run_cmd(ctx, f"{' '.join(env)} bash /tmp/install-script.sh", verbose=verbose) diff --git a/test/new-e2e/tests/agent-platform/install/install.go b/test/new-e2e/tests/agent-platform/install/install.go index 1c71c0070405b..a9583273b5b83 100644 --- a/test/new-e2e/tests/agent-platform/install/install.go +++ b/test/new-e2e/tests/agent-platform/install/install.go @@ -64,7 +64,7 @@ func Unix(t *testing.T, client ExecutorWithRetry, options ...installparams.Optio var source string if params.MajorVersion != "5" { source = "S3" - downloadCmd = fmt.Sprintf(`curl -L https://s3.amazonaws.com/dd-agent/scripts/install_script_agent%v.sh > installscript.sh`, params.MajorVersion) + downloadCmd = fmt.Sprintf(`curl -L https://install.datadoghq.com/scripts/install_script_agent%v.sh > installscript.sh`, params.MajorVersion) } else { source = "dd-agent repository" downloadCmd = "curl -L https://raw.githubusercontent.com/DataDog/dd-agent/master/packaging/datadog-agent/source/install_agent.sh > installscript.sh"