Skip to content
Merged
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
4 changes: 2 additions & 2 deletions roles/repository/templates/packagecloud.debs.j2
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
deb https://packagecloud.io/performancecopilot/pcp/{{ __repository_distro_name }} {{ ansible_distribution_release }} main
deb-src https://packagecloud.io/performancecopilot/pcp/{{ __repository_distro_name }} {{ ansible_distribution_release }} main
deb https://packagecloud.io/performancecopilot/pcp/{{ __repository_distro_name }} {{ ansible_facts['distribution_release'] }} main
deb-src https://packagecloud.io/performancecopilot/pcp/{{ __repository_distro_name }} {{ ansible_facts['distribution_release'] }} main
2 changes: 1 addition & 1 deletion roles/repository/vars/Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
---
# Put internal variables here with Debian specific values.

__repository_distro_name: "{{ ansible_distribution | lower }}"
__repository_distro_name: "{{ ansible_facts['distribution'] | lower }}"
4 changes: 2 additions & 2 deletions tests/check_header.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
- name: Check for presence of ansible managed header, fingerprint
assert:
that:
- ansible_managed in content
- __ansible_managed in content
- __fingerprint in content
vars:
content: "{{ __content.content | b64decode }}"
ansible_managed: "{{ lookup('template', 'get_ansible_managed.j2') }}"
__ansible_managed: "{{ lookup('template', 'get_ansible_managed.j2') }}"
4 changes: 2 additions & 2 deletions tests/check_pmie_webhook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
fi
pmieconf -f /var/lib/pcp/config/pmie/config.default list global webhook_endpoint | grep '"example"'
pmieconf -f /var/lib/pcp/config/pmie/config.default list global webhook_action | grep '"yes"'
when: (ansible_distribution in ['RedHat', 'CentOS'] and
when: (ansible_facts['distribution'] in ['RedHat', 'CentOS'] and
(ansible_facts['distribution_version'] is version('9.3', '<'))) or
ansible_distribution not in ['Fedora', 'RedHat', 'CentOS']
ansible_facts['distribution'] not in ['Fedora', 'RedHat', 'CentOS']
# yamllint enable rule:line-length
6 changes: 3 additions & 3 deletions tests/tests_verify_auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
pre_tasks:
- name: Skip test if not supported by platform
meta: end_host
when: (ansible_distribution in ['RedHat', 'CentOS'] and
ansible_distribution_major_version | int < 8) or
ansible_distribution not in ['Fedora', 'RedHat', 'CentOS']
when: (ansible_facts['distribution'] in ['RedHat', 'CentOS'] and
ansible_facts['distribution_major_version'] | int < 8) or
ansible_facts['distribution'] not in ['Fedora', 'RedHat', 'CentOS']

- name: Save state of services
import_tasks: get_services_state.yml
Expand Down
6 changes: 3 additions & 3 deletions tests/tests_verify_bpftrace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
pre_tasks:
- name: Skip test if not supported by platform
meta: end_host
when: (ansible_distribution in ['RedHat', 'CentOS'] and
ansible_distribution_major_version | int < 8) or
ansible_distribution not in ['Fedora', 'RedHat', 'CentOS']
when: (ansible_facts['distribution'] in ['RedHat', 'CentOS'] and
ansible_facts['distribution_major_version'] | int < 8) or
ansible_facts['distribution'] not in ['Fedora', 'RedHat', 'CentOS']

- name: Save state of services
import_tasks: get_services_state.yml
Expand Down
6 changes: 3 additions & 3 deletions tests/tests_verify_from_elasticsearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
pre_tasks:
- name: Skip test if not supported by platform
meta: end_host
when: (ansible_distribution in ['RedHat', 'CentOS'] and
ansible_distribution_major_version | int < 7) or
ansible_distribution not in ['Fedora', 'RedHat', 'CentOS']
when: (ansible_facts['distribution'] in ['RedHat', 'CentOS'] and
ansible_facts['distribution_major_version'] | int < 7) or
ansible_facts['distribution'] not in ['Fedora', 'RedHat', 'CentOS']

- name: Save state of services
import_tasks: get_services_state.yml
Expand Down
6 changes: 3 additions & 3 deletions tests/tests_verify_fullstack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
pre_tasks:
- name: Skip test if not supported by platform
meta: end_host
when: (ansible_distribution in ['RedHat', 'CentOS'] and
ansible_distribution_major_version | int < 8) or
ansible_distribution not in ['Fedora', 'RedHat', 'CentOS']
when: (ansible_facts['distribution'] in ['RedHat', 'CentOS'] and
ansible_facts['distribution_major_version'] | int < 8) or
ansible_facts['distribution'] not in ['Fedora', 'RedHat', 'CentOS']

- name: Save state of services
import_tasks: get_services_state.yml
Expand Down
4 changes: 2 additions & 2 deletions tests/tests_verify_into_elasticsearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
pre_tasks:
- name: Skip test if not supported by platform
meta: end_host
when: (ansible_distribution in ['RedHat'] and
when: (ansible_facts['distribution'] in ['RedHat'] and
(ansible_facts['distribution_version'] is version('8.4', '<'))) or
ansible_distribution not in ['Fedora', 'RedHat']
ansible_facts['distribution'] not in ['Fedora', 'RedHat']

- name: Save state of services
import_tasks: get_services_state.yml
Expand Down
6 changes: 3 additions & 3 deletions tests/tests_verify_mssql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
pre_tasks:
- name: Skip test if not supported by platform
meta: end_host
when: (ansible_distribution in ['RedHat'] and
when: (ansible_facts['distribution'] in ['RedHat'] and
(ansible_facts['distribution_version'] is version('8.4', '<'))) or
ansible_distribution not in ['Fedora', 'RedHat'] or
ansible_architecture not in ['x86_64']
ansible_facts['distribution'] not in ['Fedora', 'RedHat'] or
ansible_facts['architecture'] not in ['x86_64']

- name: Save state of services
import_tasks: get_services_state.yml
Expand Down
4 changes: 2 additions & 2 deletions tests/tests_verify_pmie_webhook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
pre_tasks:
- name: Skip test if not supported by platform
meta: end_host
when: (ansible_distribution in ['RedHat', 'CentOS'] and
when: (ansible_facts['distribution'] in ['RedHat', 'CentOS'] and
(ansible_facts['distribution_version'] is version('9.3', '<'))) or
ansible_distribution not in ['Fedora', 'RedHat', 'CentOS']
ansible_facts['distribution'] not in ['Fedora', 'RedHat', 'CentOS']

- name: Save state of services
import_tasks: get_services_state.yml
Expand Down
Loading