Skip to content

[stable-8] redis_info: adjust tests for Arch Linux #10132

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.

Sign up for GitHub

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

Merged
felixfontein merged 2 commits into from
May 14, 2025
Merged

[stable-8] redis_info: adjust tests for Arch Linux #10132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0020819
Cherry-pick parts of bf69dc46ff934091fdcb2133b4d1af16cd3319f0.
felixfontein Jan 8, 2025
cedff03
redis_info: adjust tests for Arch Linux (#10129)
felixfontein May 14, 2025
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
14 changes: 12 additions & 2 deletions tests/integration/targets/setup_redis_replication/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ redis_packages:
Alpine:
- redis
Archlinux:
- redis
- valkey
Debian:
- redis-server
Ubuntu:
Expand All @@ -22,13 +22,23 @@ redis_packages:
FreeBSD:
- redis

redis_user:
Alpine: redis
Archlinux: valkey
Debian: redis
Ubuntu: redis
openSUSE Leap: redis
Fedora: "{{ '998' if ansible_distribution_major_version is version('41', '>=') else 'redis' }}"
CentOS: redis
FreeBSD: redis

redis_bin:
Alpine: /usr/bin/redis-server
Archlinux: /usr/bin/redis-server
Debian: /usr/bin/redis-server
Ubuntu: /usr/bin/redis-server
openSUSE Leap: /usr/sbin/redis-server
Fedora: /usr/bin/redis-server
Fedora: "/usr/bin/{{ 'valkey-server' if ansible_distribution_major_version is version('41', '>=') else 'redis-server' }}"
CentOS: /usr/bin/redis-server
FreeBSD: /usr/local/bin/redis-server

Expand Down
8 changes: 4 additions & 4 deletions tests/integration/targets/setup_redis_replication/tasks/setup_redis_cluster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
file:
path: "{{ item }}"
state: directory
owner: redis
group: redis
owner: "{{ redis_user[ansible_distribution] }}"
group: "{{ redis_user[ansible_distribution] }}"
loop:
- "{{ master_datadir }}"
- "{{ master_logdir }}"
Expand Down Expand Up @@ -54,10 +54,10 @@
datadir: "{{ replica_datadir }}"

- name: Start redis master
shell: "{{ redis_bin[ansible_distribution] }} {{ master_conf }}"
ansible.builtin.command: "{{ redis_bin[ansible_distribution] }} {{ master_conf }}"

- name: Start redis replica
shell: "{{ redis_bin[ansible_distribution] }} {{ replica_conf }} --{% if old_redis %}slaveof{% else %}replicaof{% endif %} 127.0.0.1 {{ master_port }}"
ansible.builtin.command: "{{ redis_bin[ansible_distribution] }} {{ replica_conf }} --{% if old_redis %}slaveof{% else %}replicaof{% endif %} 127.0.0.1 {{ master_port }}"

- name: Wait for redis master to be started
ansible.builtin.wait_for:
Expand Down