From: Kienan Stewart <kstewart@efficios.com>
Date: Mon, 26 Feb 2024 12:51:27 +0000 (-0500)
Subject: ansible: Remove installation of curl from bookworm-backports
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=ee108d0f51861dc4324c20caf3a8a90d1bfe4623;p=lttng-ci.git

ansible: Remove installation of curl from bookworm-backports

The configuration adjustment should be sufficient to avoid the
problem. It's not a big issue to use curl from bookworm-backports
otherwise, but the 'apt: upgrade' statement means that all the package
updates get run, violating an expectation for the default playbook
that only new packages will be installed - no updates should happen.

Change-Id: I8c083aa4d6a5d0a61a3924f52f295eab15467354
Signed-off-by: Kienan Stewart <kstewart@efficios.com>
---

diff --git a/automation/ansible/roles/common/tasks/setup-Debian.yml b/automation/ansible/roles/common/tasks/setup-Debian.yml
index 6785e7d..80faa0a 100644
--- a/automation/ansible/roles/common/tasks/setup-Debian.yml
+++ b/automation/ansible/roles/common/tasks/setup-Debian.yml
@@ -90,15 +90,6 @@
   # @see https://support.efficios.com/issues/1532
   when: ansible_distribution_release == 'bookworm'
   block:
-    - name: Add bookworm-backports pref
-      ansible.builtin.copy:
-        dest: /etc/apt/preferences.d/bookworm-backports.pref
-        content: "Package: curl libcurl3* libcurl4*\nPin: release n=bookworm-backports\nPin-Priority: 600\n"
-    - name: Enable bookworm backports
-      ansible.builtin.apt_repository:
-        repo: 'deb http://deb.debian.org/debian bookworm-backports main'
-    - ansible.builtin.apt:
-        upgrade: 'yes'
     - name: Use HTTP/1.1 with git HTTP operations
       community.general.git_config:
         file: '/etc/gitconfig'