diff --git a/utils/build/virtual_machine/provisions/auto-inject/auto-inject_installer_manual.yml b/utils/build/virtual_machine/provisions/auto-inject/auto-inject_installer_manual.yml index 61878ce819..fbea89c3ae 100644 --- a/utils/build/virtual_machine/provisions/auto-inject/auto-inject_installer_manual.yml +++ b/utils/build/virtual_machine/provisions/auto-inject/auto-inject_installer_manual.yml @@ -10,8 +10,7 @@ if [ "${DD_env}" == "dev" ]; then # To force the installer to pull from dev repositories -- agent config is set manually to datadoghq.com export DD_SITE="datad0g.com" - export DD_INSTALLER_REGISTRY_URL='669783387624.dkr.ecr.us-east-1.amazonaws.com/dockerhub/datadog' - export DD_INSTALLER_REGISTRY_AUTH='ecr' + export DD_INSTALLER_REGISTRY_URL='install.datad0g.com' else export DD_SITE="datadoghq.com" fi @@ -22,26 +21,22 @@ export DD_INSTALLER_DEFAULT_PKG_INSTALL_DATADOG_AGENT=true if [ -n "${DD_INSTALLER_LIBRARY_VERSION}" ]; then - export "DD_INSTALLER_REGISTRY_AUTH_APM_LIBRARY_$(echo "$DD_LANG" | tr "[:lower:]" "[:upper:]")_PACKAGE"='ecr' - export "DD_INSTALLER_REGISTRY_URL_APM_LIBRARY_$(echo "$DD_LANG" | tr "[:lower:]" "[:upper:]")_PACKAGE"='669783387624.dkr.ecr.us-east-1.amazonaws.com' + export "DD_INSTALLER_REGISTRY_URL_APM_LIBRARY_$(echo "$DD_LANG" | tr "[:lower:]" "[:upper:]")_PACKAGE"='installtesting.datad0g.com' export "DD_INSTALLER_DEFAULT_PKG_VERSION_DATADOG_APM_LIBRARY_$(echo "$DD_LANG" | tr "[:lower:]" "[:upper:]")"="${DD_INSTALLER_LIBRARY_VERSION}" fi if [ -n "${DD_INSTALLER_INJECTOR_VERSION}" ]; then - export DD_INSTALLER_REGISTRY_AUTH_APM_INJECT_PACKAGE='ecr' - export DD_INSTALLER_REGISTRY_URL_APM_INJECT_PACKAGE='669783387624.dkr.ecr.us-east-1.amazonaws.com' + export DD_INSTALLER_REGISTRY_URL_APM_INJECT_PACKAGE='installtesting.datad0g.com' export DD_INSTALLER_DEFAULT_PKG_VERSION_DATADOG_APM_INJECT="${DD_INSTALLER_INJECTOR_VERSION}" fi if [ -n "${DD_INSTALLER_AGENT_VERSION}" ]; then - export DD_INSTALLER_REGISTRY_AUTH_AGENT_PACKAGE='ecr' - export DD_INSTALLER_REGISTRY_URL_AGENT_PACKAGE='669783387624.dkr.ecr.us-east-1.amazonaws.com' + export DD_INSTALLER_REGISTRY_URL_AGENT_PACKAGE='installtesting.datad0g.com' export DD_INSTALLER_DEFAULT_PKG_VERSION_DATADOG_AGENT="${DD_INSTALLER_AGENT_VERSION}" fi if [ -n "${DD_INSTALLER_INSTALLER_VERSION}" ]; then - export DD_INSTALLER_REGISTRY_AUTH_INSTALLER_PACKAGE='ecr' - export DD_INSTALLER_REGISTRY_URL_INSTALLER_PACKAGE='669783387624.dkr.ecr.us-east-1.amazonaws.com' + export DD_INSTALLER_REGISTRY_URL_INSTALLER_PACKAGE='installtesting.datad0g.com' export DD_INSTALLER_DEFAULT_PKG_VERSION_DATADOG_INSTALLER="${DD_INSTALLER_INSTALLER_VERSION}" fi diff --git a/utils/build/virtual_machine/provisions/auto-inject/repositories/autoinstall/execute_install_script.sh b/utils/build/virtual_machine/provisions/auto-inject/repositories/autoinstall/execute_install_script.sh index 5c5862a366..dc4f6b1fef 100755 --- a/utils/build/virtual_machine/provisions/auto-inject/repositories/autoinstall/execute_install_script.sh +++ b/utils/build/virtual_machine/provisions/auto-inject/repositories/autoinstall/execute_install_script.sh @@ -16,8 +16,7 @@ fi if [ "${DD_env}" == "dev" ]; then # To force the installer to pull from dev repositories -- agent config is set manually to datadoghq.com export DD_SITE="datad0g.com" - export DD_INSTALLER_REGISTRY_URL='669783387624.dkr.ecr.us-east-1.amazonaws.com/dockerhub/datadog' - export DD_INSTALLER_REGISTRY_AUTH='ecr' + export DD_INSTALLER_REGISTRY_URL='install.datad0g.com' else export DD_SITE="datadoghq.com" fi @@ -27,26 +26,22 @@ export DD_APM_INSTRUMENTATION_LIBRARIES="${DD_LANG}" export DD_INSTALLER_DEFAULT_PKG_INSTALL_DATADOG_AGENT=true if [ -n "${DD_INSTALLER_LIBRARY_VERSION}" ]; then - export "DD_INSTALLER_REGISTRY_AUTH_APM_LIBRARY_$(echo "$DD_LANG" | tr "[:lower:]" "[:upper:]")_PACKAGE"='ecr' - export "DD_INSTALLER_REGISTRY_URL_APM_LIBRARY_$(echo "$DD_LANG" | tr "[:lower:]" "[:upper:]")_PACKAGE"='669783387624.dkr.ecr.us-east-1.amazonaws.com' + export "DD_INSTALLER_REGISTRY_URL_APM_LIBRARY_$(echo "$DD_LANG" | tr "[:lower:]" "[:upper:]")_PACKAGE"='installtesting.datad0g.com' export "DD_INSTALLER_DEFAULT_PKG_VERSION_DATADOG_APM_LIBRARY_$(echo "$DD_LANG" | tr "[:lower:]" "[:upper:]")"="${DD_INSTALLER_LIBRARY_VERSION}" fi if [ -n "${DD_INSTALLER_INJECTOR_VERSION}" ]; then - export DD_INSTALLER_REGISTRY_AUTH_APM_INJECT_PACKAGE='ecr' - export DD_INSTALLER_REGISTRY_URL_APM_INJECT_PACKAGE='669783387624.dkr.ecr.us-east-1.amazonaws.com' + export DD_INSTALLER_REGISTRY_URL_APM_INJECT_PACKAGE='installtesting.datad0g.com' export DD_INSTALLER_DEFAULT_PKG_VERSION_DATADOG_APM_INJECT="${DD_INSTALLER_INJECTOR_VERSION}" fi if [ -n "${DD_INSTALLER_AGENT_VERSION}" ]; then - export DD_INSTALLER_REGISTRY_AUTH_AGENT_PACKAGE='ecr' - export DD_INSTALLER_REGISTRY_URL_AGENT_PACKAGE='669783387624.dkr.ecr.us-east-1.amazonaws.com' + export DD_INSTALLER_REGISTRY_URL_AGENT_PACKAGE='installtesting.datad0g.com' export DD_INSTALLER_DEFAULT_PKG_VERSION_DATADOG_AGENT="${DD_INSTALLER_AGENT_VERSION}" fi if [ -n "${DD_INSTALLER_INSTALLER_VERSION}" ]; then - export DD_INSTALLER_REGISTRY_AUTH_INSTALLER_PACKAGE='ecr' - export DD_INSTALLER_REGISTRY_URL_INSTALLER_PACKAGE='669783387624.dkr.ecr.us-east-1.amazonaws.com' + export DD_INSTALLER_REGISTRY_URL_INSTALLER_PACKAGE='installtesting.datad0g.com' export DD_INSTALLER_DEFAULT_PKG_VERSION_DATADOG_INSTALLER="${DD_INSTALLER_INSTALLER_VERSION}" fi