From aad775b81d6b6d0e7a2e7bd4fc32d7ef67daccfa Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Tue, 21 May 2024 12:17:29 +0200
Subject: [PATCH 1/6] Publish IgProf also for slc8

---
 publish/aliPublish.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/publish/aliPublish.conf b/publish/aliPublish.conf
index a72b6d1f..9388f137 100644
--- a/publish/aliPublish.conf
+++ b/publish/aliPublish.conf
@@ -329,6 +329,7 @@ architectures:
     RPM: false
     include:
       grid-base-packages: true
+      IgProf: true
       O2PDPSuite:
         - ^async-.*$
         # Only publish nightlies from December to June, pending a decision

From f8e8d6609013c6f8ad8d364471fda128568159db Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Tue, 21 May 2024 12:41:01 +0200
Subject: [PATCH 2/6] Revert back and use v1.16.1

---
 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 dc8ca952..a6f46be5 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.0#egg=alibuild'
+INSTALL_ALIBUILD='alisw/alibuild@v1.16.1#egg=alibuild'
 INSTALL_ALIBOT='alisw/ali-bot@master#egg=ali-bot'

From dc7d89cee5b397a5920d9052b861a62f1248b1d8 Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Sat, 25 May 2024 09:35:49 +0200
Subject: [PATCH 3/6] Update aliPublish.conf

---
 publish/aliPublish.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/publish/aliPublish.conf b/publish/aliPublish.conf
index 9388f137..4110db4f 100644
--- a/publish/aliPublish.conf
+++ b/publish/aliPublish.conf
@@ -357,6 +357,7 @@ architectures:
       ApMon-CPP: true
       GMP: true
       capstone: true
+      CMake: true
       abseil: true
       bz2: true
       IgProf: true

From 5cb07c31a183a5314238f76a7948a914c8c3735c Mon Sep 17 00:00:00 2001
From: Irakli Chakaberia <iraklic@gmail.com>
Date: Mon, 27 May 2024 10:57:29 -0700
Subject: [PATCH 4/6] JAliEn & MonALISA in el9 (#1330)

---
 publish/aliPublish.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/publish/aliPublish.conf b/publish/aliPublish.conf
index 4110db4f..dcf73712 100644
--- a/publish/aliPublish.conf
+++ b/publish/aliPublish.conf
@@ -373,6 +373,10 @@ architectures:
         - ^v5-09-[0-9]+[a-z]*-01_FLUKA-1$
       O2Physics:
         - ^CEFP202[0-9]v[0-9]+-[0-9]+$
+      MonALISA:
+        - ^20[0-9]+-[0-9]+$
+      JAliEn:
+        - ^1\..*-[0-9]+$
 
   ubt14_x86-64:
     CVMFS: ubuntu1404-x86_64

From f4c38976758effa4d01af802d12e86a122867846 Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Tue, 28 May 2024 12:26:24 +0200
Subject: [PATCH 5/6] Revert back also slc9 to 1.16.1 (#1331)

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

diff --git a/ci/repo-config/mesosci/slc9/o2-alidist.env b/ci/repo-config/mesosci/slc9/o2-alidist.env
index 51fefd28..19c51429 100644
--- a/ci/repo-config/mesosci/slc9/o2-alidist.env
+++ b/ci/repo-config/mesosci/slc9/o2-alidist.env
@@ -5,7 +5,7 @@ PR_REPO=alisw/alidist
 PR_BRANCH=master
 NO_ASSUME_CONSISTENT_EXTERNALS=
 TRUST_COLLABORATORS=true
-INSTALL_ALIBUILD='alisw/alibuild@v1.17.1#egg=alibuild'
+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

From 5ce26892328b566d7e5598406810034fb7c9a533 Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Thu, 30 May 2024 10:41:58 +0200
Subject: [PATCH 6/6] Do not aggressively cleanup slc9

---
 cleanup/cleanup-rules.yaml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/cleanup/cleanup-rules.yaml b/cleanup/cleanup-rules.yaml
index bd03674b..e72e8131 100644
--- a/cleanup/cleanup-rules.yaml
+++ b/cleanup/cleanup-rules.yaml
@@ -8,6 +8,19 @@
 # constructor: weeks, days, hours, minutes, seconds, microseconds,
 # milliseconds.
 
+- architectures: [slc9_x86-64, slc9_aarch64]
+  packages:
+    - O2PDPSuite
+    - O2
+    - O2Physics
+    - O2sim
+    - O2DPG
+    - DataDistribution
+    - QualityControl
+  # These packages were published as RPMs, so we must reserve their revision
+  # numbers by keeping symlinks and only deleting the main tarball.
+  delete_symlinks: false
+
 - architectures: [slc8_x86-64]
   packages:
     - O2PDPSuite
@@ -87,7 +100,6 @@
     days: 7
 
 - architectures:
-    - slc9_x86-64
     - ubuntu2004_x86-64
     - ubuntu2204_x86-64
   packages: