Don't upgrade pip twice (#1483)

alisw · Feb 20, 2025 · b0d264b · b0d264b
1 parent 35c068a
commit b0d264b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/daily-tags.sh b/daily-tags.sh
@@ -58,15 +58,6 @@ rm -rf alidist/
 git config --global user.name 'ALICE Builder'
 git config --global user.email alibuild@cern.ch
 
-PYTHON_USER_OPT=""
-if [[ -z "$VIRTUAL_ENV" ]]; then
-    PYTHON_USER_OPT="--user"
-fi
-
-# Upgrade pip
-python3 -m pip install ${PYTHON_USER_OPT} --upgrade pip
-# Install the latest release if ALIBUILD_SLUG is not provided
-python3 -m pip install ${PYTHON_USER_OPT} --upgrade "${ALIBUILD_SLUG:+git+https://github.com/}${ALIBUILD_SLUG:-alibuild}"
 aliBuild analytics off
 
 # The alidist branches are always named with a trailing .0 instead of the

diff --git a/jenkins/daily-tags b/jenkins/daily-tags
@@ -17,6 +17,7 @@ try {
     node ("slc9_x86-64-light") {
       timeout (240) {
         withEnv(["ALIBOT_SLUG=${ALIBOT_SLUG}",
+                 "ALIBUILD_SLUG=${ALIBUILD_SLUG}",
                  "WAIT_PR_LIMIT=${WAIT_PR_LIMIT}",
                  "PACKAGES=${PACKAGES}"]) {
           withCredentials([[$class: 'StringBinding',
@@ -34,6 +35,7 @@ try {
               mkdir -p /local/tmp
               case $ARCHITECTURE in
                 ubuntu24*)
+                  # Bypass PEP 668
                   PYTHON_USER_OPT="--break-system-packages --user"
                   ;;
                 *)
@@ -42,6 +44,7 @@ try {
               esac
               TMPDIR=/local/tmp python3 -m pip install ${PYTHON_USER_OPT} --upgrade pip
               TMPDIR=/local/tmp python3 -m pip install ${PYTHON_USER_OPT} --upgrade "${ALIBOT_SLUG:+git+https://github.com/${ALIBOT_SLUG}}"
+              TMPDIR=/local/tmp python3 -m pip install --upgrade ${PYTHON_USER_OPT} "${ALIBUILD_SLUG:+git+https://github.com/}${ALIBUILD_SLUG:-alibuild}"
               type check-open-pr
               if [ "${PACKAGES%% *}" = AliPhysics ]; then
                 WAIT_TESTS="build/AliPhysics/release build/AliPhysics/root6"
@@ -116,6 +119,7 @@ try {
               mkdir -p /local/tmp
               case $ARCHITECTURE in
                 ubuntu24*)
+                  # Bypass PEP 668
                   PYTHON_USER_OPT="--break-system-packages --user"
                   ;;
                 *)
@@ -124,6 +128,7 @@ try {
               esac
               TMPDIR=/local/tmp python3 -m pip install --upgrade ${PYTHON_USER_OPT} pip
               TMPDIR=/local/tmp python3 -m pip install --upgrade ${PYTHON_USER_OPT} "git+https://github.com/$ALIBOT_SLUG"
+              TMPDIR=/local/tmp python3 -m pip install --upgrade ${PYTHON_USER_OPT} "${ALIBUILD_SLUG:+git+https://github.com/}${ALIBUILD_SLUG:-alibuild}"
               [ -f /opt/rh/rh-git218/enable ] && source /opt/rh/rh-git218/enable
               daily-tags.sh || err=$?
               rm -rf alidist daily-tags.?????????? mirror