Merge 5ce2689 into sapling-pr-archive-ktf

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'

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

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:

publish/aliPublish.conf

@@ -357,6 +357,7 @@ architectures:
       ApMon-CPP: true
       GMP: true
       capstone: true
+      CMake: true
       abseil: true
       bz2: true
       IgProf: true
@@ -372,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