Merge 74006c1 into sapling-pr-archive-ktf

ktf · Aug 21, 2024 · bcff59f · bcff59f
2 parents 5af016d + 74006c1
commit bcff59f
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 32 deletions.
diff --git a/ci/continuous-builder.sh b/ci/continuous-builder.sh
@@ -87,6 +87,9 @@ if [ -n "$HASHES" ]; then
       # Setup environment. Skip build if the .env file doesn't exist any more.
       source_env_files "$env_name" || exit
 
+      # Pass the versions down for logging
+      export INSTALL_ALIBUILD INSTALL_ALIBOT INSTALL_ALIDIST
+
       # Make a directory for this repo's dependencies so they don't conflict
       # with other repos'
       mkdir -p "$env_name"

diff --git a/ci/repo-config/DEFAULTS.env b/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].7#egg=alibuild'
+INSTALL_ALIBUILD='alisw/[email protected].10#egg=alibuild'
 INSTALL_ALIBOT='alisw/ali-bot@master#egg=ali-bot'
diff --git a/daily-tags.sh b/daily-tags.sh
@@ -58,10 +58,15 @@ rm -rf alidist/
 git config --global user.name 'ALICE Builder'
 git config --global user.email [email protected]
 
+PYTHON_USER_OPT=""
+if [[ -z "$VIRTUAL_ENV" ]]; then
+    PYTHON_USER_OPT="--user"
+fi
+
 # Upgrade pip
-python3 -m pip install --user --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 --user --upgrade "${ALIBUILD_SLUG:+git+https://github.com/}${ALIBUILD_SLUG:-alibuild}"
+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
@@ -32,8 +32,18 @@ try {
               rm -rf "$PYTHONUSERBASE"
               yum install -y python3-pip python3-devel python3-setuptools
               mkdir -p /local/tmp
-              TMPDIR=/local/tmp python3 -m pip install --user --upgrade pip
-              TMPDIR=/local/tmp python3 -m pip install --user --upgrade "${ALIBOT_SLUG:+git+https://github.com/${ALIBOT_SLUG}}"
+              case $ARCHITECTURE in
+                ubuntu24*)
+                  python -m venv /local/tmp/venv
+                  source /local/tmp/venv/bin/activate
+                  PYTHON_USER_OPT=""
+                  ;;
+                *)
+                  PYTHON_USER_OPT="--user"
+                  ;;
+              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}}"
               type check-open-pr
               if [ "${PACKAGES%% *}" = AliPhysics ]; then
                 WAIT_TESTS="build/AliPhysics/release build/AliPhysics/root6"
@@ -117,8 +127,18 @@ try {
 		  ;;
               esac
               mkdir -p /local/tmp
-              TMPDIR=/local/tmp python3 -m pip install --upgrade --user pip
-              TMPDIR=/local/tmp python3 -m pip install --upgrade --user "git+https://github.com/$ALIBOT_SLUG"
+              case $ARCHITECTURE in
+                ubuntu24*)
+                  python -m venv /local/tmp/venv
+                  source /local/tmp/venv/bin/activate
+                  PYTHON_USER_OPT=""
+                  ;;
+                *)
+                  PYTHON_USER_OPT="--user"
+                  ;;
+              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"
               [ -f /opt/rh/rh-git218/enable ] && source /opt/rh/rh-git218/enable
               daily-tags.sh || err=$?
               rm -rf alidist daily-tags.?????????? mirror

diff --git a/mesos-dns-lookup b/mesos-dns-lookup
diff --git a/pyproject.toml b/pyproject.toml
@@ -89,8 +89,6 @@ sync-mapusers.py = {path = "ci/sync-mapusers.py"}
 update-symlink-manifests = {path = "update-symlink-manifests"}
 # Get PR information
 prinfo = {path = "ci/prinfo"}
-# Resolve Mesos DNS
-mesos-dns-lookup = {path = "mesos-dns-lookup"}
 # Helpers
 clean-repo-ci = {path = "clean-repo-ci"}
 ci-status-overview = {path = "ci-status-overview"}

diff --git a/setup.py b/setup.py
@@ -152,8 +152,6 @@
         "update-symlink-manifests",
         # Get PR information
         "ci/prinfo",
-        # Resolve Mesos DNS
-        "mesos-dns-lookup",
         # Helpers
         "clean-repo-ci",
         "ci-status-overview",