Merge 76ab810 into sapling-pr-archive-ktf

build-any-ib.sh

@@ -30,15 +30,8 @@ export PYTHONUSERBASE=$(mktemp -d)
 export PATH=$PYTHONUSERBASE/bin:$PATH
 export LD_LIBRARY_PATH=$PYTHONUSERBASE/lib:$LD_LIBRARY_PATH
 # Set the default python and pip depending on the architecture...
-case $ARCHITECTURE in
-  slc6*) PIP=pip PYTHON=python ;;
-  *) PIP=pip3 PYTHON=python3 ;;
-esac
-# ...and override it if PYTHON_VERSION is specified.
-case "$PYTHON_VERSION" in
-  2) PIP=pip2 PYTHON=python2 ;;
-  3) PIP=pip3 PYTHON=python3 ;;
-esac
+PIP=pip3 PYTHON=python3
+$PIP install --user --upgrade pip
 $PIP install --user --upgrade "${ALIBUILD_SLUG:+git+https://github.com/}${ALIBUILD_SLUG:-alibuild}"
 type aliBuild
 

ci/repo-config/DEFAULTS.env

@@ -7,5 +7,5 @@ MAX_DIFF_SIZE=20000000
 TIMEOUT=120
 LONG_TIMEOUT=36000
 DOCKER_EXTRA_ARGS='--tmpfs=/dev/shm:rw,size=8g,mode=1777'
-INSTALL_ALIBUILD='alisw/[email protected].6#egg=alibuild'
+INSTALL_ALIBUILD='alisw/[email protected].7#egg=alibuild'
 INSTALL_ALIBOT='alisw/ali-bot@master#egg=ali-bot'

daily-tags.sh

@@ -58,19 +58,10 @@ rm -rf alidist/
 git config --global user.name 'ALICE Builder'
 git config --global user.email [email protected]
 
-# Set the default python and pip depending on the architecture...
-case $ARCHITECTURE in
-  *) PIP=pip3 PYTHON=python3 ;;
-esac
-# ...and override it if PYTHON_VERSION is specified.
-case "$PYTHON_VERSION" in
-  3) PIP=pip3 PYTHON=python3 ;;
-esac
-
 # Upgrade pip
-$PIP install --user --upgrade pip
+python3 -m pip install --user --upgrade pip
 # Install the latest release if ALIBUILD_SLUG is not provided
-$PIP install --user --upgrade "${ALIBUILD_SLUG:+git+https://github.com/}${ALIBUILD_SLUG:-alibuild}"
+python3 -m pip install --user --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

jenkins/daily-tags

@@ -31,8 +31,8 @@ try {
               export PATH="$PYTHONUSERBASE/bin:$PATH"
               rm -rf "$PYTHONUSERBASE"
               yum install -y python3-pip python3-devel python3-setuptools
-              pip3 install --user --upgrade pip
-              pip3 install --user --upgrade "${ALIBOT_SLUG:+git+https://github.com/${ALIBOT_SLUG}}"
+              python3 -m pip install --user --upgrade pip
+              python3 -m pip install --user --upgrade "${ALIBOT_SLUG:+git+https://github.com/${ALIBOT_SLUG}}"
               type check-open-pr
               if [ "${PACKAGES%% *}" = AliPhysics ]; then
                 WAIT_TESTS="build/AliPhysics/release build/AliPhysics/root6"
@@ -106,20 +106,17 @@ try {
               export LD_LIBRARY_PATH=${PYTHONUSERBASE}/lib:${LD_LIBRARY_PATH}
               echo $NODE_NAME
               case $NODE_NAME in
-                *ubuntu*)
-                  # On Ubuntu 20.04, pip is pip3. (On Ubuntu 18.04, it's still pip2.)
-                  pip=pip ;;
                 *slc8*)
                   export ALIBUILD_O2_FORCE_GPU=1
                   export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH:+$CMAKE_PREFIX_PATH:}/opt/rocm/lib/cmake:/opt/clang/lib/cmake
                   export AMDAPPSDKROOT=/opt/amd-app
                   export PATH=$PATH${PATH:+:}/usr/local/cuda/bin
-                  pip=pip3 ;;
+		  ;;
                 *)
-                  pip=pip3 ;;
+		  ;;
               esac
-              $pip install --upgrade --user pip
-              $pip install --upgrade --user "git+https://github.com/$ALIBOT_SLUG"
+              python3 -m pip install --upgrade --user pip
+              python3 -m pip install --upgrade --user "git+https://github.com/$ALIBOT_SLUG"
               [ -f /opt/rh/rh-git218/enable ] && source /opt/rh/rh-git218/enable
               daily-tags.sh || err=$?
               rm -rf alidist daily-tags.?????????? mirror