From aac0228c74346aa1a13cb87b0bc816cedf21df57 Mon Sep 17 00:00:00 2001
From: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
Date: Fri, 16 Dec 2022 10:21:34 -0300
Subject: [PATCH] ci: Force reinstall of python tools to workaround GitHub
 cache issue

Signed-off-by: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
---
 tools/ci/cibuild.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tools/ci/cibuild.sh b/tools/ci/cibuild.sh
index 42efbca8ba..e98ff17f82 100755
--- a/tools/ci/cibuild.sh
+++ b/tools/ci/cibuild.sh
@@ -278,22 +278,21 @@ function python-tools {
   export PIP_USER=yes
   export PYTHONUSERBASE=${tools}/pylocal
   add_path "${PYTHONUSERBASE}"/bin
-  pip3 install \
+
+  # Force the reinstall of python packages due to issues with GitHub
+  # cache restoration.
+  pip3 install --force-reinstall \
     CodeChecker \
     cxxfilt \
     esptool==3.3.1 \
+    imgtool==1.9.0 \
     pexpect==4.8.0 \
     pyelftools \
     pyserial==3.5 \
     pytest==6.2.5 \
     pytest-json==0.4.0 \
     pytest-ordering==0.6 \
-    pytest-repeat==0.9.1 
-
-  # MCUboot's tool for image signing and key management
-  if ! command -v imgtool &> /dev/null; then
-    pip3 install imgtool
-  fi
+    pytest-repeat==0.9.1
 }
 
 function riscv-gcc-toolchain {