Skip to content

Commit

Permalink
Fix CI by pinning proper Agent 5 version (#468)
Browse files Browse the repository at this point in the history
* Use Agent 5.32.9-1 in CI
* Only use 5.32.9 on RHEL-based platforms
  • Loading branch information
Slavek Kabrda committed Jan 13, 2023
1 parent d752114 commit 3c2c471
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ commands:
- run: bash -c '[ -f /etc/datadog-agent/datadog.yaml.example ] || [ -f /etc/dd-agent/datadog.conf.example ]'
- run: bash -c '[ ! -f /etc/datadog-agent/datadog.yaml ] && [ ! -f /etc/datadog-agent/system-probe.yaml ] && [ ! -f /etc/datadog-agent/security-agent.yaml ] && [ ! -f /etc/dd-agent/datadog.conf ]'

downgrade_agent_5_23_0:
downgrade_agent_5_32:
parameters:
python:
type: string
Expand Down Expand Up @@ -78,7 +78,7 @@ commands:
- install_agent:
version: "<<parameters.version>>"
python: "<<parameters.python>>"
- downgrade_agent_5_23_0:
- downgrade_agent_5_32:
python: "<<parameters.python>>"

test_agent_install:
Expand Down
2 changes: 1 addition & 1 deletion ci_test/downgrade_to_5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
vars:
datadog_api_key: "11111111111111111111111111111111"
datadog_agent_major_version: 5
datadog_agent_version: 1:5.23.0-1
datadog_agent_version: "{{ '1:5.32.9-1' if ansible_facts.os_family in ['RedHat', 'Rocky', 'AlmaLinux'] else '1:5.32.8-1' }}"
datadog_agent_allow_downgrade: yes
datadog_config:
tags: "mytag0, mytag1"
Expand Down

0 comments on commit 3c2c471

Please sign in to comment.