Try out the new registry

.github/workflows/test-agent-target.yml

@@ -20,7 +20,7 @@ on:
       agent-image:
         required: false
         description: Agent 7 image
-        default: "datadog/agent:7-rc"
+        default: "registry.datadoghq.com/agent:7-rc"
         type: string
       test-py2:
         required: false
@@ -30,7 +30,7 @@ on:
       agent-image-py2:
         required: false
         description: Agent 6 image
-        default: "datadog/agent:6-rc"
+        default: "registry.datadoghq.com/agent:6-rc"
         type: string
       platform:
         required: true

.github/workflows/test-agent-windows.yml

@@ -11,7 +11,7 @@ on:
       agent-image:
         required: false
         description: Agent 7 image
-        default: "datadog/agent:7-rc"
+        default: "registry.datadoghq.com/agent:7-rc"
         type: string
       agent-image-windows:
         required: false
@@ -26,7 +26,7 @@ on:
       agent-image-py2:
         required: false
         description: Agent 6 image
-        default: "datadog/agent:6-rc"
+        default: "registry.datadoghq.com/agent:6-rc"
         type: string
       agent-image-windows-py2:
         required: false

.github/workflows/test-agent.yml

@@ -11,12 +11,12 @@ on:
       agent-image:
         required: false
         description: Agent 7 image
-        default: "datadog/agent:7-rc"
+        default: "registry.datadoghq.com/agent:7-rc"
         type: string
       agent-image-windows:
         required: false
         description: Agent 7 image on Windows
-        default: "datadog/agent:7-rc-servercore"
+        default: "datadog/agent:7-rc-servercore" # todo: support registry.datadoghq.com
         type: string
       test-py2:
         required: false
@@ -26,12 +26,12 @@ on:
       agent-image-py2:
         required: false
         description: Agent 6 image
-        default: "datadog/agent:6-rc"
+        default: "registry.datadoghq.com/agent:6-rc"
         type: string
       agent-image-windows-py2:
         required: false
         description: Agent 6 image on Windows
-        default: "datadog/agent-dev:master-py2-win-servercore"
+        default: "datadog/agent-dev:master-py2-win-servercore" # todo: support registry.datadoghq.com
         type: string
 
 jobs:

.github/workflows/test-all-windows.yml

@@ -35,19 +35,19 @@ on:
         type: boolean
       agent-image:
         required: false
-        default: "datadog/agent-dev:master-py3"
+        default: "registry.datadoghq.com/agent-dev:master-py3"
         type: string
       agent-image-py2:
         required: false
-        default: "datadog/agent-dev:master-py2"
+        default: "datadog/agent-dev:master-py2" # todo: support registry.datadoghq.com
         type: string
       agent-image-windows:
         required: false
-        default: "datadog/agent-dev:master-py3-win-servercore"
+        default: "datadog/agent-dev:master-py3-win-servercore" # todo: support registry.datadoghq.com
         type: string
       agent-image-windows-py2:
         required: false
-        default: "datadog/agent-dev:master-py2-win-servercore"
+        default: "datadog/agent-dev:master-py2-win-servercore" # todo: support registry.datadoghq.com
         type: string
       pytest-args:
         description: "Arguments to pass to pytest"

.github/workflows/test-all.yml

@@ -33,19 +33,19 @@ on:
         type: boolean
       agent-image:
         required: false
-        default: "datadog/agent-dev:master-py3"
+        default: "registry.datadoghq.com/agent-dev:master-py3"
         type: string
       agent-image-py2:
         required: false
-        default: "datadog/agent-dev:master-py2"
+        default: "datadog/agent-dev:master-py2" # todo: support registry.datadoghq.com
         type: string
       agent-image-windows:
         required: false
-        default: "datadog/agent-dev:master-py3-win-servercore"
+        default: "datadog/agent-dev:master-py3-win-servercore" # todo: support registry.datadoghq.com
         type: string
       agent-image-windows-py2:
         required: false
-        default: "datadog/agent-dev:master-py2-win-servercore"
+        default: "datadog/agent-dev:master-py2-win-servercore" # todo: support registry.datadoghq.com
         type: string
       pytest-args:
         description: "Arguments to pass to pytest"

.github/workflows/test-fips-e2e.yml

@@ -113,14 +113,14 @@ jobs:
 
     - name: Run E2E tests with FIPS disabled
       env:
-        DDEV_E2E_AGENT: "${{ inputs.agent-image || 'datadog/agent-dev:master-py3' }}"
+        DDEV_E2E_AGENT: "${{ inputs.agent-image || 'registry.datadoghq.com/agent-dev:master-py3' }}"
         DD_API_KEY: "${{ secrets.DD_API_KEY }}"
       run: |
         ddev env test --base --new-env --junit ${{ inputs.target || 'tls' }} -- all -m "fips_off"
 
     - name: Run E2E tests with FIPS enabled
       env:
-        DDEV_E2E_AGENT: "${{ inputs.agent-image-fips || 'datadog/agent-dev:master-fips' }}"
+        DDEV_E2E_AGENT: "${{ inputs.agent-image-fips || 'registry.datadoghq.com/agent-dev:master-fips' }}" 
         DD_API_KEY: "${{ secrets.DD_API_KEY }}"
       run: |
         ddev env test --base --new-env --junit ${{ inputs.target || 'tls' }} -- all -k "fips_on"

.github/workflows/test-target.yml

@@ -55,19 +55,19 @@ on:
         type: boolean
       agent-image:
         required: false
-        default: "datadog/agent-dev:master-py3"
+        default: "registry.datadoghq.com/agent-dev:master-py3"
         type: string
       agent-image-py2:
         required: false
-        default: "datadog/agent-dev:master-py2"
+        default: "datadog/agent-dev:master-py2" # todo: support registry.datadoghq.com
         type: string
       agent-image-windows:
         required: false
-        default: "datadog/agent-dev:master-py3-win-servercore"
+        default: "datadog/agent-dev:master-py3-win-servercore" # todo: support registry.datadoghq.com
         type: string
       agent-image-windows-py2:
         required: false
-        default: "datadog/agent-dev:master-py2-win-servercore"
+        default: "datadog/agent-dev:master-py2-win-servercore" # todo: support registry.datadoghq.com
         type: string
       traces-artifact-name:
         required: false

datadog_checks_base/tests/compose/kerberos/kerberos-agent/Dockerfile

@@ -1,4 +1,4 @@
-FROM datadog/agent:7.25.0-rc.4
+FROM registry.datadoghq.com/agent:7.25.0-rc.4
 
 ENV DEBIAN_FRONTEND=noninteractive
 

datadog_checks_dev/datadog_checks/dev/tooling/config.py

@@ -43,9 +43,9 @@
         'integrations-internal-core': os.path.join('~', 'dd', 'integrations-internal-core'),
     },
     'agents': {
-        'master': {'docker': 'datadog/agent-dev:master', 'local': 'latest'},
-        '7': {'docker': 'datadog/agent:7', 'local': '7'},
-        '6': {'docker': 'datadog/agent:6', 'local': '6'},
+        'master': {'docker': 'registry.datadoghq.com/agent-dev:master', 'local': 'latest'},
+        '7': {'docker': 'registry.datadoghq.com/agent:7', 'local': '7'},
+        '6': {'docker': 'registry.datadoghq.com/agent:6', 'local': '6'},
     },
     'orgs': {
         'default': {

datadog_checks_dev/datadog_checks/dev/tooling/e2e/docker.py

@@ -73,7 +73,10 @@ def __init__(
         # If we use a default non-RC build, and it's missing the py suffix, adds it
         if default_agent and self.agent_build and 'rc' not in self.agent_build and 'py' not in self.agent_build:
             # Agent 6 image no longer supports -pyX
-            if self.agent_build != 'datadog/agent:6' and self.agent_build != 'datadog/agent:7':
+            if (
+                self.agent_build != 'registry.datadoghq.com/agent:6'
+                and self.agent_build != 'registry.datadoghq.com/agent:7'
+            ):
                 self.agent_build = f'{self.agent_build}-py{self.python_version}'
             echo_debug("Using default agent. Agent build: {}".format(self.agent_build))
 

ddev/src/ddev/config/model.py

@@ -176,8 +176,8 @@ def agents(self):
                 self._field_agents = agents
             else:
                 self._field_agents = self.raw_data['agents'] = {
-                    'dev': {'docker': 'datadog/agent-dev:master', 'local': 'latest'},
-                    '7': {'docker': 'datadog/agent:7', 'local': '7'},
+                    'dev': {'docker': 'registry.datadoghq.com/agent-dev:master-py3', 'local': 'latest'},
+                    '7': {'docker': 'registry.datadoghq.com/agent:7', 'local': '7'},
                 }
 
         return self._field_agents

ddev/src/ddev/e2e/agent/docker.py

@@ -47,14 +47,14 @@ def disable_integration_before_install(config_file):
 
 def _normalize_agent_image_name(agent_build: str | None, python_major: int, use_jmx: bool) -> str:
     if not agent_build:
-        return 'datadog/agent-dev:master-py3'
+        return 'registry.datadoghq.com/agent-dev:master-py3'
 
     if match := re.match(AGENT_IMAGE_REGEX, agent_build):
         org, image, tag = match.groups()
 
         if org != 'datadog':
             # Some non datadog image has been selected
-            return agent_build
+            return agent_build  # todo: support registry.datadoghq.com
 
         version_match = re.match(AGENT_VERSION_REGEX, tag)
 

ddev/tests/cli/config/test_set.py

@@ -37,14 +37,16 @@ def test_standard_deep(ddev, config_file, helpers):
 
 
 def test_standard_complex(ddev, config_file, helpers):
-    result = ddev('config', 'set', 'agents.latest', "{'docker': 'datadog/agent:latest', 'local': 'latest'}")
+    result = ddev(
+        'config', 'set', 'agents.latest', "{'docker': 'registry.datadoghq.com/agent:latest', 'local': 'latest'}"
+    )
 
     assert result.exit_code == 0, result.output
     assert result.output == helpers.dedent(
         """
         New setting:
         [agents.latest]
-        docker = "datadog/agent:latest"
+        docker = "registry.datadoghq.com/agent:latest"
         local = "latest"
         """
     )

ddev/tests/cli/config/test_show.py

@@ -23,11 +23,11 @@
 agent = "{AGENT_PATH}"
 
 [agents.dev]
-docker = "datadog/agent-dev:master"
+docker = "registry.datadoghq.com/agent-dev:master-py3"
 local = "latest"
 
 [agents.7]
-docker = "datadog/agent:7"
+docker = "registry.datadoghq.com/agent:7"
 local = "7"
 
 [orgs.default]
@@ -71,11 +71,11 @@
 agent = "{AGENT_PATH}"
 
 [agents.dev]
-docker = "datadog/agent-dev:master"
+docker = "registry.datadoghq.com/agent-dev:master-py3"
 local = "latest"
 
 [agents.7]
-docker = "datadog/agent:7"
+docker = "registry.datadoghq.com/agent:7"
 local = "7"
 
 [orgs.default]

ddev/tests/cli/env/test_start.py

@@ -91,7 +91,7 @@ def test_stop_on_error(ddev, helpers, data_dir, write_result_file, mocker):
     assert not env_data.exists()
 
     start.assert_called_once_with(
-        agent_build='datadog/agent-dev:master',
+        agent_build='registry.datadoghq.com/agent-dev:master-py3',
         local_packages={},
         env_vars={'DD_DD_URL': 'https://app.datadoghq.com', 'DD_SITE': 'datadoghq.com'},
     )
@@ -129,7 +129,7 @@ def test_basic(ddev, helpers, data_dir, write_result_file, mocker):
     assert env_data.read_metadata() == metadata
 
     start.assert_called_once_with(
-        agent_build='datadog/agent-dev:master',
+        agent_build='registry.datadoghq.com/agent-dev:master-py3',
         local_packages={},
         env_vars={'DD_DD_URL': 'https://app.datadoghq.com', 'DD_SITE': 'datadoghq.com'},
     )
@@ -169,7 +169,7 @@ def test_agent_build_config(ddev, config_file, helpers, data_dir, write_result_f
     assert env_data.read_metadata() == metadata
 
     start.assert_called_once_with(
-        agent_build='datadog/agent:7',
+        agent_build='registry.datadoghq.com/agent:7',
         local_packages={},
         env_vars={'DD_DD_URL': 'https://app.datadoghq.com', 'DD_SITE': 'datadoghq.com'},
     )
@@ -188,7 +188,7 @@ def test_agent_build_env_var(ddev, config_file, helpers, data_dir, write_result_
     environment = 'py3.12'
     env_data = EnvDataStorage(data_dir).get(integration, environment)
 
-    with EnvVars({E2EEnvVars.AGENT_BUILD: 'datadog/agent:6'}):
+    with EnvVars({E2EEnvVars.AGENT_BUILD: 'registry.datadoghq.com/agent:6'}):
         result = ddev('env', 'start', integration, environment)
 
     assert result.exit_code == 0, result.output
@@ -210,7 +210,7 @@ def test_agent_build_env_var(ddev, config_file, helpers, data_dir, write_result_
     assert env_data.read_metadata() == metadata
 
     start.assert_called_once_with(
-        agent_build='datadog/agent:6',
+        agent_build='registry.datadoghq.com/agent:6',
         local_packages={},
         env_vars={'DD_DD_URL': 'https://app.datadoghq.com', 'DD_SITE': 'datadoghq.com'},
     )
@@ -229,8 +229,8 @@ def test_agent_build_flag(ddev, config_file, helpers, data_dir, write_result_fil
     environment = 'py3.12'
     env_data = EnvDataStorage(data_dir).get(integration, environment)
 
-    with EnvVars({E2EEnvVars.AGENT_BUILD: 'datadog/agent:6'}):
-        result = ddev('env', 'start', integration, environment, '-a', 'datadog/agent:7-rc')
+    with EnvVars({E2EEnvVars.AGENT_BUILD: 'registry.datadoghq.com/agent:6'}):
+        result = ddev('env', 'start', integration, environment, '-a', 'registry.datadoghq.com/agent:7-rc')
 
     assert result.exit_code == 0, result.output
     assert result.output == helpers.dedent(
@@ -251,7 +251,7 @@ def test_agent_build_flag(ddev, config_file, helpers, data_dir, write_result_fil
     assert env_data.read_metadata() == metadata
 
     start.assert_called_once_with(
-        agent_build='datadog/agent:7-rc',
+        agent_build='registry.datadoghq.com/agent:7-rc',
         local_packages={},
         env_vars={'DD_DD_URL': 'https://app.datadoghq.com', 'DD_SITE': 'datadoghq.com'},
     )
@@ -288,7 +288,7 @@ def test_local_dev(ddev, helpers, local_repo, data_dir, write_result_file, mocke
     assert env_data.read_metadata() == metadata
 
     start.assert_called_once_with(
-        agent_build='datadog/agent-dev:master',
+        agent_build='registry.datadoghq.com/agent-dev:master-py3',
         local_packages={local_repo / integration: '[deps]'},
         env_vars={'DD_DD_URL': 'https://app.datadoghq.com', 'DD_SITE': 'datadoghq.com'},
     )
@@ -325,7 +325,7 @@ def test_local_base(ddev, helpers, local_repo, data_dir, write_result_file, mock
     assert env_data.read_metadata() == metadata
 
     start.assert_called_once_with(
-        agent_build='datadog/agent-dev:master',
+        agent_build='registry.datadoghq.com/agent-dev:master-py3',
         local_packages={
             local_repo / 'datadog_checks_base': '[db,deps,http,json,kube]',
             local_repo / integration: '[deps]',
@@ -365,7 +365,7 @@ def test_env_vars(ddev, helpers, data_dir, write_result_file, mocker):
     assert env_data.read_metadata() == metadata
 
     start.assert_called_once_with(
-        agent_build='datadog/agent-dev:master',
+        agent_build='registry.datadoghq.com/agent-dev:master-py3',
         local_packages={},
         env_vars={'DD_DD_URL': 'https://app.datadoghq.com', 'DD_SITE': 'datadoghq.com', 'FOO': 'BAR', 'BAZ': 'BAR'},
     )
@@ -402,7 +402,7 @@ def test_env_vars_apm_enabled_from_metadata(ddev, helpers, data_dir, write_resul
     assert env_data.read_metadata() == metadata
 
     start.assert_called_once_with(
-        agent_build='datadog/agent-dev:master',
+        agent_build='registry.datadoghq.com/agent-dev:master-py3',
         local_packages={},
         env_vars={
             'DD_DD_URL': 'https://app.datadoghq.com',
@@ -459,7 +459,7 @@ def test_env_vars_override_config(ddev, helpers, data_dir, write_result_file, mo
     assert env_data.read_metadata() == metadata
 
     start.assert_called_once_with(
-        agent_build='datadog/agent-dev:master',
+        agent_build='registry.datadoghq.com/agent-dev:master-py3',
         local_packages={},
         env_vars={
             'DD_DD_URL': 'url',
@@ -503,7 +503,7 @@ def test_logs_detection(ddev, helpers, data_dir, write_result_file, mocker):
     assert env_data.read_metadata() == metadata
 
     start.assert_called_once_with(
-        agent_build='datadog/agent-dev:master',
+        agent_build='registry.datadoghq.com/agent-dev:master-py3',
         local_packages={},
         env_vars={'DD_DD_URL': 'https://app.datadoghq.com', 'DD_SITE': 'datadoghq.com', 'DD_LOGS_ENABLED': 'true'},
     )
@@ -540,7 +540,7 @@ def test_dogstatsd(ddev, helpers, data_dir, write_result_file, mocker):
     assert env_data.read_metadata() == metadata
 
     start.assert_called_once_with(
-        agent_build='datadog/agent-dev:master',
+        agent_build='registry.datadoghq.com/agent-dev:master-py3',
         local_packages={},
         env_vars={
             'DD_DD_URL': 'https://app.datadoghq.com',
@@ -598,7 +598,7 @@ def test_mount_log(ddev, helpers, data_dir, write_result_file, mocker):
     assert env_data.read_metadata() == expected_metadata
 
     start.assert_called_once_with(
-        agent_build='datadog/agent-dev:master',
+        agent_build='registry.datadoghq.com/agent-dev:master-py3',
         local_packages={},
         env_vars={
             'DD_DD_URL': 'https://app.datadoghq.com',