Skip to content

Commit a48669e

Browse files
peschmaepandafy
andauthored
[feature] Add support for Debian Bullseye/redis 6 #285
Closes #285 Co-authored-by: Gagan Deep <pandafy.dev@gmail.com>
1 parent 00684c4 commit a48669e

File tree

4 files changed

+22
-4
lines changed

4 files changed

+22
-4
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
- ubuntu1804
2525
- ubuntu2004
2626
- debian10
27+
- debian11
2728

2829
steps:
2930
- uses: actions/checkout@v2

molecule/local/molecule.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ platforms:
3232
- /sys/fs/cgroup:/sys/fs/cgroup:ro
3333
privileged: true
3434
pre_build_image: true
35+
- name: "openwisp2-debian11"
36+
image: "geerlingguy/docker-debian11-ansible:latest"
37+
command: ${MOLECULE_DOCKER_COMMAND:-""}
38+
volumes:
39+
- /sys/fs/cgroup:/sys/fs/cgroup:ro
40+
privileged: true
41+
pre_build_image: true
3542
provisioner:
3643
name: ansible
3744
env:

tasks/apt.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,16 @@
3232
register: result
3333
until: result is success
3434

35+
- name: Install redis 6 if available
36+
apt:
37+
name: "redis-server=5:6*"
38+
notify:
39+
- reload systemd
40+
- start redis
41+
ignore_errors: true
42+
register: use_redis6
43+
when: openwisp2_redis_install
44+
3545
- name: Install redis 5 if available
3646
apt:
3747
name: "redis-server=5:5*"
@@ -40,16 +50,16 @@
4050
- start redis
4151
ignore_errors: true
4252
register: use_redis5
43-
when: openwisp2_redis_install
53+
when: openwisp2_redis_install and use_redis6 is failed
4454

4555
- name: Install redis 4 (fallback)
46-
when: openwisp2_redis_install and use_redis5.failed
56+
when: openwisp2_redis_install and (use_redis5 is failed and use_redis6 is failed)
4757
apt:
4858
name: "redis-server=5:4*"
59+
register: use_redis4
4960
notify:
5061
- reload systemd
5162
- start redis
52-
ignore_errors: true
5363

5464
# On the newer versions of redis, by default redis
5565
# binds to localhost on ipv6 address which wouldn't

tasks/pip.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
- molecule-idempotence-notest
8181

8282
- name: Pin channels_redis to 2.4 for redis 4 compatibility
83-
when: use_redis5 is defined and use_redis5.failed is defined and use_redis5.failed
83+
when: use_redis4 is defined and use_redis4 is succeeded
8484
pip:
8585
name:
8686
- channels_redis~=2.4

0 commit comments

Comments
 (0)