From b2959031bd6ecd7448c6a3aece95e71c48c79675 Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Tue, 11 Jun 2024 22:06:00 +0200
Subject: [PATCH 1/4] Drop slc6 support

---
 jenkins/daily-tags | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/jenkins/daily-tags b/jenkins/daily-tags
index 110104fa..3b0b9115 100644
--- a/jenkins/daily-tags
+++ b/jenkins/daily-tags
@@ -105,9 +105,6 @@ try {
               export LD_LIBRARY_PATH=${PYTHONUSERBASE}/lib:${LD_LIBRARY_PATH}
               echo $NODE_NAME
               case $NODE_NAME in
-                *slc6*)
-                  # python3 is not installed on the slc6-builder. Installing it seems to break the build.
-                  pip=pip2 ;;
                 *ubuntu*)
                   # On Ubuntu 20.04, pip is pip3. (On Ubuntu 18.04, it's still pip2.)
                   pip=pip ;;

From 2d9abd75019f2158dbe82a1d45dc58aba262ac95 Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Tue, 11 Jun 2024 22:06:00 +0200
Subject: [PATCH 2/4] Upgrade pip as requested by centos8

---
 jenkins/daily-tags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jenkins/daily-tags b/jenkins/daily-tags
index 3b0b9115..4ecc3642 100644
--- a/jenkins/daily-tags
+++ b/jenkins/daily-tags
@@ -117,6 +117,7 @@ try {
                 *)
                   pip=pip3 ;;
               esac
+              $pip install --upgrade --user pip
               $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=$?

From 9896ae213caff45052d22dbc5eebfa1a82389e92 Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Wed, 12 Jun 2024 13:32:13 +0200
Subject: [PATCH 3/4] Use aliBuild v1.17.3

---
 ci/repo-config/DEFAULTS.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/repo-config/DEFAULTS.env b/ci/repo-config/DEFAULTS.env
index a6f46be5..83158671 100644
--- 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/alibuild@v1.16.1#egg=alibuild'
+INSTALL_ALIBUILD='alisw/alibuild@v1.17.3#egg=alibuild'
 INSTALL_ALIBOT='alisw/ali-bot@master#egg=ali-bot'

From 8bca2ba8ed775e91ecf6c6c0a556132274aee64a Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Thu, 13 Jun 2024 11:26:32 +0200
Subject: [PATCH 4/4] Move to use v1.17.4

---
 ci/repo-config/DEFAULTS.env                | 2 +-
 ci/repo-config/mesosci/slc9/o2-alidist.env | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ci/repo-config/DEFAULTS.env b/ci/repo-config/DEFAULTS.env
index 83158671..88566bd3 100644
--- 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/alibuild@v1.17.3#egg=alibuild'
+INSTALL_ALIBUILD='alisw/alibuild@v1.17.4#egg=alibuild'
 INSTALL_ALIBOT='alisw/ali-bot@master#egg=ali-bot'
diff --git a/ci/repo-config/mesosci/slc9/o2-alidist.env b/ci/repo-config/mesosci/slc9/o2-alidist.env
index 19c51429..810986a1 100644
--- a/ci/repo-config/mesosci/slc9/o2-alidist.env
+++ b/ci/repo-config/mesosci/slc9/o2-alidist.env
@@ -5,7 +5,6 @@ PR_REPO=alisw/alidist
 PR_BRANCH=master
 NO_ASSUME_CONSISTENT_EXTERNALS=
 TRUST_COLLABORATORS=true
-INSTALL_ALIBUILD='alisw/alibuild@v1.16.1#egg=alibuild'
 CHECK_NAME=build/O2/alidist-slc9-x86
 DONT_USE_COMMENTS=1
 DEVEL_PKGS="$PR_REPO $PR_BRANCH