add changelog and revert agent-dev image tag

DataDog · Sep 20, 2024 · fd3264a · fd3264a
1 parent 0a7912e
commit fd3264a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/config.py b/datadog_checks_dev/datadog_checks/dev/tooling/config.py
@@ -43,7 +43,7 @@
         'integrations-internal-core': os.path.join('~', 'dd', 'integrations-internal-core'),
     },
     'agents': {
-        'master': {'docker': 'datadog/agent-dev:kyleneale-bump-python-312-py3', 'local': 'latest'},
+        'master': {'docker': 'datadog/agent-dev:master', 'local': 'latest'},
         '7': {'docker': 'datadog/agent:7', 'local': '7'},
         '6': {'docker': 'datadog/agent:6', 'local': '6'},
     },

diff --git a/ddev/src/ddev/config/model.py b/ddev/src/ddev/config/model.py
@@ -176,7 +176,7 @@ def agents(self):
                 self._field_agents = agents
             else:
                 self._field_agents = self.raw_data['agents'] = {
-                    'dev': {'docker': 'datadog/agent-dev:kyleneale-bump-python-312-py3', 'local': 'latest'},
+                    'dev': {'docker': 'datadog/agent-dev:master', 'local': 'latest'},
                     '7': {'docker': 'datadog/agent:7', 'local': '7'},
                 }
 

diff --git a/ddev/src/ddev/e2e/agent/docker.py b/ddev/src/ddev/e2e/agent/docker.py
@@ -109,7 +109,7 @@ def start(self, *, agent_build: str, local_packages: dict[Path, str], env_vars:
         from ddev.e2e.agent.constants import AgentEnvVars
 
         if not agent_build:
-            agent_build = 'datadog/agent-dev:kyleneale-bump-python-312-py3'
+            agent_build = 'datadog/agent-dev:master'
 
         if agent_build.startswith("datadog/"):
             # Add a potentially missing `py` suffix for default non-RC builds

diff --git a/rethinkdb/changelog.d/18636.added b/rethinkdb/changelog.d/18636.added
@@ -0,0 +1 @@
+Bump RethinkDB version for py3.12 E2E tests