From 0d5c8907a050489da45c0894e5d46b9b34296898 Mon Sep 17 00:00:00 2001 From: Vlad Zolotarov Date: Thu, 2 Jan 2025 17:57:34 -0500 Subject: [PATCH 1/3] scylla-node: dummy change Never merge! Signed-off-by: Vlad Zolotarov --- ansible-scylla-node/tasks/Debian_install.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ansible-scylla-node/tasks/Debian_install.yml b/ansible-scylla-node/tasks/Debian_install.yml index ab389f26..2dc4d6bd 100644 --- a/ansible-scylla-node/tasks/Debian_install.yml +++ b/ansible-scylla-node/tasks/Debian_install.yml @@ -53,5 +53,7 @@ name: "{{ scylla_package_prefix }}={{ aptversions.stdout }}" state: present allow_downgrade: yes + + when: not scylla_is_installed or upgrade_version become: true From ac9f7f7384f05fe7eeba8eb8da2893fee6d38395 Mon Sep 17 00:00:00 2001 From: Vlad Zolotarov Date: Thu, 2 Jan 2025 21:17:46 -0500 Subject: [PATCH 2/3] scylla-node/molecule/ubuntu2004: use U24.04 image Never merge! Signed-off-by: Vlad Zolotarov --- ansible-scylla-node/molecule/ubuntu2004/molecule.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible-scylla-node/molecule/ubuntu2004/molecule.yml b/ansible-scylla-node/molecule/ubuntu2004/molecule.yml index d410965a..6981515e 100644 --- a/ansible-scylla-node/molecule/ubuntu2004/molecule.yml +++ b/ansible-scylla-node/molecule/ubuntu2004/molecule.yml @@ -8,7 +8,7 @@ driver: name: docker platforms: - name: node1 - image: jrei/systemd-ubuntu:20.04 + image: jrei/systemd-ubuntu:24.04 privileged: true command: /lib/systemd/systemd volumes: @@ -24,7 +24,7 @@ platforms: - name: "scylla" ipv4_address: "10.11.0.2" - name: node2 - image: jrei/systemd-ubuntu:20.04 + image: jrei/systemd-ubuntu:24.04 privileged: true command: /lib/systemd/systemd volumes: @@ -35,7 +35,7 @@ platforms: - name: "scylla" ipv4_address: "10.11.0.3" - name: node3 - image: jrei/systemd-ubuntu:20.04 + image: jrei/systemd-ubuntu:24.04 privileged: true command: /lib/systemd/systemd volumes: From 34ebcbf7a1c6c8d1593374ac0b38d983b00e2559 Mon Sep 17 00:00:00 2001 From: Vlad Zolotarov Date: Thu, 2 Jan 2025 21:58:55 -0500 Subject: [PATCH 3/3] Revert "scylla-node/molecule/ubuntu2004: use U24.04 image" This reverts commit ac9f7f7384f05fe7eeba8eb8da2893fee6d38395. --- ansible-scylla-node/molecule/ubuntu2004/molecule.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible-scylla-node/molecule/ubuntu2004/molecule.yml b/ansible-scylla-node/molecule/ubuntu2004/molecule.yml index 6981515e..d410965a 100644 --- a/ansible-scylla-node/molecule/ubuntu2004/molecule.yml +++ b/ansible-scylla-node/molecule/ubuntu2004/molecule.yml @@ -8,7 +8,7 @@ driver: name: docker platforms: - name: node1 - image: jrei/systemd-ubuntu:24.04 + image: jrei/systemd-ubuntu:20.04 privileged: true command: /lib/systemd/systemd volumes: @@ -24,7 +24,7 @@ platforms: - name: "scylla" ipv4_address: "10.11.0.2" - name: node2 - image: jrei/systemd-ubuntu:24.04 + image: jrei/systemd-ubuntu:20.04 privileged: true command: /lib/systemd/systemd volumes: @@ -35,7 +35,7 @@ platforms: - name: "scylla" ipv4_address: "10.11.0.3" - name: node3 - image: jrei/systemd-ubuntu:24.04 + image: jrei/systemd-ubuntu:20.04 privileged: true command: /lib/systemd/systemd volumes: