Merge pull request #36 from JaimeFrey/HTCONDOR-2253-cleanup-grid-reso…

…urce HTCONDOR-2253 cleanup grid resource
osg-htc · Mar 7, 2024 · 972ea83 · 972ea83
2 parents 07c7a9f + 65386f1
commit 972ea83
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/supported/osg-htc/osg-hosted-ce/Chart.yaml b/supported/osg-htc/osg-hosted-ce/Chart.yaml
@@ -3,4 +3,4 @@ apiVersion: v1
 appVersion: "V5-branch"
 description: OSG Hosted Compute Entrypoint
 name: osg-hosted-ce
-version: 4.7.2
+version: 4.7.3
diff --git a/supported/osg-htc/osg-hosted-ce/templates/configmap.yaml b/supported/osg-htc/osg-hosted-ce/templates/configmap.yaml
@@ -138,17 +138,13 @@ data:
     JOB_ROUTER_POST_ROUTE_TRANSFORM_NAMES = $(JOB_ROUTER_POST_ROUTE_TRANSFORM_NAMES) Token
 
     JOB_ROUTER_TRANSFORM_GridResource @=jrt
-        gr = batch {{ .Values.RemoteCluster.Batch }} $(MY.Owner)@{{ .Values.RemoteCluster.LoginHost }}
-        gr = $(gr) --rgahp-glite ~/{{ .Values.RemoteCluster.BoscoDir | default "~/bosco"}}/glite
-        {{ if .Values.BoscoOverrides.TarballURL | default "" | contains "bosco-1.3"  }}
-        gr = $(gr) --rgahp-script batch_gahp
-        {{ end }}
-        {{ if not .Values.RemoteCluster.SSHBatchMode }}
-        gr = $(gr) --rgahp-nobatchmode
-        {{ end }}
-        {{ if not .Values.RemoteCluster.LoginShell }}
-        gr = $(gr) --rgahp-nologin
-        {{ end }}
+        hosted_grid_resource = batch {{ .Values.RemoteCluster.Batch }} $(MY.Owner)@{{ .Values.RemoteCluster.LoginHost }} --rgahp-glite ~/{{ .Values.RemoteCluster.BoscoDir | default "~/bosco"}}/glite
+        {{- if not .Values.RemoteCluster.SSHBatchMode }} --rgahp-nobatchmode{{ end }}
+        {{- if not .Values.RemoteCluster.LoginShell }} --rgahp-nologin{{ end }}
+        SET GridResource "$(hosted_grid_resource)"
+        # This is the old name for hosted_grid_resource.
+        # We can remove this once all CEs are updated to not use it.
+        gr = $(hosted_grid_resource)
     @jrt
     JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES = $(JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES) GridResource
 
@@ -167,7 +163,6 @@ data:
     JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = False
     JOB_ROUTER_ROUTE_Hosted_CE_default_route @=jrt
         GridResource = "dummy"
-        SET GridResource "$(gr)"
     @jrt
     {{ else }}
     JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True