Build Rucio 34 images

dmwm · Apr 4, 2024 · 34a00b4 · 34a00b4
1 parent e7287c9
commit 34a00b4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 26 deletions.
diff --git a/docker/rucio-daemons/Dockerfile b/docker/rucio-daemons/Dockerfile
@@ -26,16 +26,6 @@ RUN rmdir /etc/grid-security/certificates && ln -s /cvmfs/grid.cern.ch/etc/grid-
 
 ADD docker/rucio-daemons/cms-entrypoint.sh /
 
-# Eric patch for cache-consumer (revisit if ever comes up again)
-
-# ADD https://raw.githubusercontent.com/ericvaandering/rucio/fix_cache_consumer/lib/rucio/daemons/cache/consumer.py /usr/local/lib/python3.6/site-packages/rucio/daemons/cache/consumer.py
-# RUN python3 -m compileall /usr/local/lib/python3.6/site-packages/rucio/daemons/cache
-# ADD https://raw.githubusercontent.com/ericvaandering/rucio/fix_cache_consumer/lib/rucio/core/volatile_replica.py /usr/local/lib/python3.6/site-packages/rucio/core/volatile_replica.py
-# RUN python3 -m compileall /usr/local/lib/python3.6/site-packages/rucio/core
-# ADD https://raw.githubusercontent.com/ericvaandering/rucio/fix_cache_consumer/lib/rucio/common/stomp_utils.py /usr/local/lib/python3.6/site-packages/rucio/common/stomp_utils.py
-# RUN python3 -m compileall /usr/local/lib/python3.6/site-packages/rucio/common
-# ADD https://raw.githubusercontent.com/ericvaandering/containers/add_preparer/daemons/rucio.cfg.j2 /tmp/rucio.cfg.j2
-
 # Cannot make patch directory unless there are patches
 #RUN mkdir -p /patch
 

diff --git a/docker/rucio-probes/Dockerfile b/docker/rucio-probes/Dockerfile
@@ -34,22 +34,19 @@ ADD https://raw.githubusercontent.com/nsmith-/probes/hack_replicas/common/check_
 # Supplanted in PR115 ADD https://raw.githubusercontent.com/ericvaandering/probes/cms_check_expired_rules/common/check_expired_rules /probes/common
 ADD https://raw.githubusercontent.com/ericvaandering/probes/cms_check_expired_locked/common/check_expired_locked_rules /probes/common
 
-# PR 130 - Should be in 33.7
-ADD https://raw.githubusercontent.com/haozturk/probes/720-fix/cms/check_rule_counts /probes/cms/
-
-# PR 126 - Should be in 33.7
-ADD https://raw.githubusercontent.com/rucio/probes/cms_rules_by_account_to_prom/cms/check_rules_states_by_account /probes/cms/
-
 # PR 132 - Not accepted into rucio/probes yet
-ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_expired_dids /probes
-ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_fts_backlog /probes
-ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_messages_to_submit /probes
-ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_new_dids /probes
-ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_stuck_rules /probes
-ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_transfer_queues_status /probes
-ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_unevaluated_dids /probes
-ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_unlocked_replicas /probes
-ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_updated_dids /probes
+ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_expired_dids /probes/common
+ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_fts_backlog /probes/common
+ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_messages_to_submit /probes/common
+ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_new_dids /probes/common
+ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_stuck_rules /probes/common
+ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_transfer_queues_status /probes/common
+ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_unevaluated_dids /probes/common
+ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_unlocked_replicas /probes/common
+ADD https://raw.githubusercontent.com/voetberg/rucio_probes/common_context_manager_update/common/check_updated_dids /probes/common
+
+# PR 134 - Should be in 34.1
+ADD https://raw.githubusercontent.com/Panos512/probes/20240307_unifies_cms_space_probe/cms/check_used_space /probes/cms
 
 RUN chmod +x /probes/common/check_*
 RUN chmod +x /probes/cms/check_*

diff --git a/src/policy/CMSRucioPolicy/__init__.py b/src/policy/CMSRucioPolicy/__init__.py
@@ -4,7 +4,7 @@
 
 from CMSRucioPolicy.algorithms import lfn2pfn, auto_approve
 
-SUPPORTED_VERSION = ["1.30", "1.31", "32", "33", "34"]
+SUPPORTED_VERSION = ["32", "33", "34"]
 
 
 def get_algorithms():