From 569dff3c6fb3494564c4412af211bbf31a1844d1 Mon Sep 17 00:00:00 2001
From: Jakub Kocka <jakub.kocka@espressif.com>
Date: Fri, 21 Nov 2025 08:53:09 +0100
Subject: [PATCH 1/2] ci: Fixed MacOS default shell command

---
 .gitlab/ci/common.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab/ci/common.yml b/.gitlab/ci/common.yml
index 71b0a2273a..6906d4f91e 100644
--- a/.gitlab/ci/common.yml
+++ b/.gitlab/ci/common.yml
@@ -127,7 +127,7 @@ variables:
 
   # download constraint file for dev
   if [[ -n "$CI_PYTHON_CONSTRAINT_BRANCH" ]]; then
-    wget -O /tmp/constraint.txt --header="Authorization:Bearer ${ESPCI_TOKEN}" ${GITLAB_HTTP_SERVER}/api/v4/projects/2581/repository/files/${CI_PYTHON_CONSTRAINT_FILE}/raw?ref=${CI_PYTHON_CONSTRAINT_BRANCH}
+        wget -O /tmp/constraint.txt --header="Authorization:Bearer ${ESPCI_TOKEN}" "${GITLAB_HTTP_SERVER}/api/v4/projects/2581/repository/files/${CI_PYTHON_CONSTRAINT_FILE}/raw?ref=${CI_PYTHON_CONSTRAINT_BRANCH}"
     mkdir -p ~/.espressif
     mv /tmp/constraint.txt ~/.espressif/${CI_PYTHON_CONSTRAINT_FILE}
   fi

From 5791519a4a8ee1f494ffd1b7c40f295287da8b78 Mon Sep 17 00:00:00 2001
From: Roland Dobai <roland.dobai@espressif.com>
Date: Mon, 24 Nov 2025 18:24:46 +0100
Subject: [PATCH 2/2] ci(gitlab): Upgrade the full dependency tree of
 CI-related Python packages

The eager upgreade policy should upgrade the full dependency tree and
not just the packages listed in the requirements file. The disadvantage
is some extra time for package resolution.

This upgrade policy is applied to CI-related packages only because we
don't want this to be used for customer-facing packages and/or provide
the customers with a different environment to that tested in the CI.
---
 .gitlab/ci/common.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.gitlab/ci/common.yml b/.gitlab/ci/common.yml
index 6906d4f91e..f95238fe1b 100644
--- a/.gitlab/ci/common.yml
+++ b/.gitlab/ci/common.yml
@@ -164,6 +164,15 @@ variables:
   source ./export.sh
   section_end "source_export"
 
+  # Eager upgrade of CI dependencies
+  # Done after sourcing export.sh so that we could easily invoke the right pip
+  section_start "upgrade_ci_dependencies" "Upgrading CI dependencies"
+  pip install --upgrade --upgrade-strategy=eager -r $IDF_PATH/tools/requirements/requirements.ci.txt -c ~/.espressif/${CI_PYTHON_CONSTRAINT_FILE}
+  if [[ "${CI_JOB_STAGE}" == "target_test" ]]; then
+    pip install --upgrade --upgrade-strategy=eager -r $IDF_PATH/tools/requirements/requirements.test-specific.txt -c ~/.espressif/${CI_PYTHON_CONSTRAINT_FILE}
+  fi
+  section_end "upgrade_ci_dependencies"
+
   REEXPORT_NEEDED=0
   if [[ ! -z "$INSTALL_EXTRA_TOOLS" ]]; then
     section_start "installing_optional_tools" "Install optional tools ${INSTALL_EXTRA_TOOLS}"