From 6cc33e515c6a5623b94a788a4d32a1a212150ed5 Mon Sep 17 00:00:00 2001
From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com>
Date: Sun, 10 Aug 2025 22:00:12 +0200
Subject: [PATCH] [PR #1113/1ba34b9b backport][stable-3] CI: Add Debian 13
 Trixie (#1114)

* CI: Add Debian 13 Trixie (#1113)

* Add Debian 13 Trixie to CI.

* I don't think this is needed any longer.

* Debian: adjust way GPG signature is installed for Docker's software repo.

(cherry picked from commit 1ba34b9b7c2aa8af47444134baaeda85252269a9)

* Skip Docker Compose v1 on Debian Trixie.

---------

Co-authored-by: Felix Fontein <felix@fontein.de>
---
 .azure-pipelines/azure-pipelines.yml          |  6 ++--
 .../targets/setup_docker/tasks/Debian.yml     | 32 +++++++++++++++----
 .../targets/setup_docker/vars/Debian.yml      |  1 -
 .../vars/Debian-13.yml                        |  6 ++++
 4 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 tests/integration/targets/setup_docker_compose_v1/vars/Debian-13.yml

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index aa24912f..cda2b33a 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -183,10 +183,12 @@ stages:
         parameters:
           testFormat: 2.19/linux-community/{0}
           targets:
-            - name: Debian Bullseye
+            - name: Debian 11 Bullseye
               test: debian-bullseye/3.9
-            - name: Debian Bookworm
+            - name: Debian 12 Bookworm
               test: debian-bookworm/3.11
+            - name: Debian 13 Trixie
+              test: debian-13-trixie/3.13
             - name: ArchLinux
               test: archlinux/3.13
           groups:
diff --git a/tests/integration/targets/setup_docker/tasks/Debian.yml b/tests/integration/targets/setup_docker/tasks/Debian.yml
index 2a3e3cae..cd8b7bf3 100644
--- a/tests/integration/targets/setup_docker/tasks/Debian.yml
+++ b/tests/integration/targets/setup_docker/tasks/Debian.yml
@@ -14,13 +14,33 @@
     update_cache: true
   notify: cleanup docker
 
-- name: Add gpg key
-  shell: curl -fsSL https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg >key && apt-key add key
+- when:
+    - (ansible_facts.distribution == "Ubuntu" and (ansible_facts.distribution_major_version | int) >= 22) or
+      (ansible_facts.distribution == "Debian" and (ansible_facts.distribution_major_version | int) >= 12)
+  name: Add Docker repo on Ubuntu 22+ or Debian 12+
+  block:
+    - name: Add gpg key
+      get_url:
+        url: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg"
+        dest: /etc/apt/keyrings/docker.asc
 
-- name: Add Docker repo
-  apt_repository:
-    repo: deb [arch={{ 'arm64' if ansible_architecture == 'aarch64' else 'amd64' }}] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable
-    state: present
+    - name: Add Docker repo
+      apt_repository:
+        repo: deb [arch={{ 'arm64' if ansible_architecture == 'aarch64' else 'amd64' }} signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable
+        state: present
+
+- when:
+    - (ansible_facts.distribution == "Ubuntu" and (ansible_facts.distribution_major_version | int) < 22) or
+      (ansible_facts.distribution == "Debian" and (ansible_facts.distribution_major_version | int) < 12)
+  name: Add Docker repo on Ubuntu 20 or before, or Debian 11 or before
+  block:
+    - name: Add gpg key
+      shell: curl -fsSL https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg >key && apt-key add key
+
+    - name: Add Docker repo
+      apt_repository:
+        repo: deb [arch={{ 'arm64' if ansible_architecture == 'aarch64' else 'amd64' }}] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable
+        state: present
 
 - block:
   - name: Prevent service restart
diff --git a/tests/integration/targets/setup_docker/vars/Debian.yml b/tests/integration/targets/setup_docker/vars/Debian.yml
index 78f7555d..629c179e 100644
--- a/tests/integration/targets/setup_docker/vars/Debian.yml
+++ b/tests/integration/targets/setup_docker/vars/Debian.yml
@@ -7,4 +7,3 @@ docker_prereq_packages:
   - apt-transport-https
   - ca-certificates
   - curl
-  - software-properties-common
diff --git a/tests/integration/targets/setup_docker_compose_v1/vars/Debian-13.yml b/tests/integration/targets/setup_docker_compose_v1/vars/Debian-13.yml
new file mode 100644
index 00000000..c5d18002
--- /dev/null
+++ b/tests/integration/targets/setup_docker_compose_v1/vars/Debian-13.yml
@@ -0,0 +1,6 @@
+---
+# Copyright (c) Ansible Project
+# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+skip_docker_compose: true