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.

Sign up for GitHub

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

HTCONDOR-2253 Fix CERequirements when default_CERequirements not set #35

Merged
merged 1 commit into from
Feb 12, 2024
Merged

HTCONDOR-2253 Fix CERequirements when default_CERequirements not set #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion supported/osg-htc/osg-hosted-ce/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ apiVersion: v1
appVersion: "V5-branch"
description: OSG Hosted Compute Entrypoint
name: osg-hosted-ce
version: 4.7.1
version: 4.7.2
11 changes: 11 additions & 0 deletions supported/osg-htc/osg-hosted-ce/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,17 @@ data:
@jrt
JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES = $(JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES) GridResource

# Fix bug in CERequirements pre transform in base CE config
# Bug is fixed in 23.0.X (HTCONDOR-2276)
JOB_ROUTER_TRANSFORM_CERequirements @=jrt
SET CondorCE 1
if defined MY.default_CERequirements
SET CERequirements "$(MY.default_CERequirements),CondorCE"
else
SET CERequirements "CondorCE"
endif
@jrt

{{ if .Values.JobRouterUseTransforms }}
JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = False
JOB_ROUTER_ROUTE_Hosted_CE_default_route @=jrt
Expand Down
Loading