Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Rucio 36 #880

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions docker/rucio-daemons/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,9 @@ RUN rmdir /etc/grid-security/certificates && ln -s /cvmfs/grid.cern.ch/etc/grid-

ADD docker/rucio-daemons/cms-entrypoint.sh /

# Cannot make patch directory unless there are patches
RUN mkdir -p /patch

# Patch for dst_file_report: Remove when https://github.com/rucio/rucio/pull/7081 is available
ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/1.patch /patch/1.patch

# Patch for directory scoped token support
ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/4.patch /patch/token.patch

# Patch for deep flag
ADD https://patch-diff.githubusercontent.com/raw/rucio/rucio/pull/7170.diff /patch/7170.patch
# Patches are now included via flux secrets. Please see:
# https://github.com/dmwm/rucio-flux/blob/main/apps/base/patches/kustomization.yaml (and that directory)
# https://github.com/dmwm/rucio-flux/blob/main/apps/base/rucio-daemons/cms-rucio-daemons.yaml
# And prod/int-rucio-daemons.yaml

ENTRYPOINT ["/cms-entrypoint.sh"]
15 changes: 4 additions & 11 deletions docker/rucio-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,9 @@ ADD docker/rucio-server/cms-entrypoint.sh /
ADD docker/rucio-server/install_mail_templates.sh /tmp/
RUN /tmp/install_mail_templates.sh

# Cannot make patch directory unless there are patches
RUN mkdir -p /patch

# Patch for dst_file_report: Remove when https://github.com/rucio/rucio/pull/7081 is available
ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/1.patch /patch/1.patch

# Patch for directory scoped token support
ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/4.patch /patch/token.patch

# Patch for deep flag
ADD https://patch-diff.githubusercontent.com/raw/rucio/rucio/pull/7170.diff /patch/7170.patch
# Patches are now included via flux secrets. Please see:
# https://github.com/dmwm/rucio-flux/blob/main/apps/base/patches/kustomization.yaml (and that directory)
# https://github.com/dmwm/rucio-flux/blob/main/apps/base/rucio-server/cms-rucio-server.yaml
# And prod/int-rucio-server.yaml

ENTRYPOINT ["/cms-entrypoint.sh"]
2 changes: 1 addition & 1 deletion src/policy/CMSRucioPolicy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from CMSRucioPolicy.algorithms import lfn2pfn, auto_approve, pfn2lfn

SUPPORTED_VERSION = ["32", "33", "34", "35"]
SUPPORTED_VERSION = [">= 36.0"]


def get_algorithms():
Expand Down
Loading