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.

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

test e2e with docker build of Agent with py 3.12.6 #18635

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/test-target.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
PYTHON_FILTER: "${{ (inputs.test-py2 && !inputs.test-py3) && '2.7' || (!inputs.test-py2 && inputs.test-py3) && (inputs.python-version || '3.12') || '' }}"
SKIP_ENV_NAME: "${{ (inputs.test-py2 && !inputs.test-py3) && 'py3.*' || (!inputs.test-py2 && inputs.test-py3) && 'py2.*' || '' }}"
# Windows E2E requires Windows containers
DDEV_E2E_AGENT: "${{ inputs.platform == 'windows' && (inputs.agent-image-windows || 'datadog/agent-dev:master-py3-win-servercore') || inputs.agent-image }}"
DDEV_E2E_AGENT: "${{ inputs.platform == 'windows' && (inputs.agent-image-windows || 'datadog/agent-dev:kyleneale-bump-python-312-py3-win-servercore') || inputs.agent-image }}"
DDEV_E2E_AGENT_PY2: "${{ inputs.platform == 'windows' && (inputs.agent-image-windows-py2 || 'datadog/agent-dev:master-py2-win-servercore') || inputs.agent-image-py2 }}"
# Test results for later processing
TEST_RESULTS_BASE_DIR: ".test-results"
Expand Down
2 changes: 1 addition & 1 deletion datadog_checks_dev/datadog_checks/dev/tooling/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
'integrations-internal-core': os.path.join('~', 'dd', 'integrations-internal-core'),
},
'agents': {
'master': {'docker': 'datadog/agent-dev:master', 'local': 'latest'},
'master': {'docker': 'datadog/agent-dev:kyleneale-bump-python-312-py3', 'local': 'latest'},
'7': {'docker': 'datadog/agent:7', 'local': '7'},
'6': {'docker': 'datadog/agent:6', 'local': '6'},
},
Expand Down
2 changes: 1 addition & 1 deletion ddev/src/ddev/config/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def agents(self):
self._field_agents = agents
else:
self._field_agents = self.raw_data['agents'] = {
'dev': {'docker': 'datadog/agent-dev:master', 'local': 'latest'},
'dev': {'docker': 'datadog/agent-dev:kyleneale-bump-python-312-py3', 'local': 'latest'},
'7': {'docker': 'datadog/agent:7', 'local': '7'},
}

Expand Down
2 changes: 1 addition & 1 deletion ddev/src/ddev/e2e/agent/docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:master'
agent_build = 'datadog/agent-dev:kyleneale-bump-python-312-py3'

if agent_build.startswith("datadog/"):
# Add a potentially missing `py` suffix for default non-RC builds
Expand Down
Loading