From 1c0c343bb6a1280f5bf05178b790ac00b3df6a8d Mon Sep 17 00:00:00 2001
From: Daniel Lipovetsky <daniel.lipovetsky@nutanix.com>
Date: Tue, 17 Sep 2024 11:19:48 -0700
Subject: [PATCH] fix: Wait for concurrent apt process to release lock

---
 ansible/roles/packages/tasks/debian.yaml | 41 ++++++++++++------------
 ansible/roles/sysprep/tasks/debian.yml   |  4 +++
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/ansible/roles/packages/tasks/debian.yaml b/ansible/roles/packages/tasks/debian.yaml
index 09cc4c1eb..e3f118c4a 100644
--- a/ansible/roles/packages/tasks/debian.yaml
+++ b/ansible/roles/packages/tasks/debian.yaml
@@ -4,19 +4,18 @@
     name: apt-transport-https
     state: latest
     update_cache: true
-  register: result
-  until: result is success
-  retries: 3
-  delay: 3
-
+  register: apt_lock_status
+  until: apt_lock_status is not failed
+  retries: 5
+  delay: 10
 
 - name: apt update package management cache
   apt:
     update_cache: true
-  register: result
-  until: result is success
-  retries: 3
-  delay: 3
+  register: apt_lock_status
+  until: apt_lock_status is not failed
+  retries: 5
+  delay: 10
 
 - name: install common debs
   apt:
@@ -26,10 +25,10 @@
       - python3-cryptography
       - python3-pip
     state: present
-  register: result
-  until: result is success
-  retries: 3
-  delay: 3
+  register: apt_lock_status
+  until: apt_lock_status is not failed
+  retries: 5
+  delay: 10
 
 - name: install pinned debs
   apt:
@@ -56,20 +55,20 @@
     name: kubelet={{ package_versions.kubernetes_deb }}
     state: present
     force: true
-  register: kubelet_installation_deb
-  until: kubelet_installation_deb is success
-  retries: 3
-  delay: 3
+  register: apt_lock_status
+  until: apt_lock_status is not failed
+  retries: 5
+  delay: 10
 
 - name: install kubectl deb package
   apt:
     name: kubectl={{ package_versions.kubernetes_deb }}
     state: present
     force: true
-  register: result
-  until: result is success
-  retries: 3
-  delay: 3
+  register: apt_lock_status
+  until: apt_lock_status is not failed
+  retries: 5
+  delay: 10
 
 - name: add version hold for kubelet and kubectl packages
   command: apt-mark hold {{ item }}
diff --git a/ansible/roles/sysprep/tasks/debian.yml b/ansible/roles/sysprep/tasks/debian.yml
index 6a5ee49ba..6086b1010 100644
--- a/ansible/roles/sysprep/tasks/debian.yml
+++ b/ansible/roles/sysprep/tasks/debian.yml
@@ -57,6 +57,10 @@
     autoclean: true
     autoremove: true
     force_apt_get: true
+  register: apt_lock_status
+  until: apt_lock_status is not failed
+  retries: 5
+  delay: 10
 
 - name: Remove apt package lists
   file: