Merge pull request #22 from brianhlin/HTCONDOR-503.add-sl-support

Add Scientific Linux OS detection (HTCONDOR-503)

Author: timtheisen

Dockerfile

@@ -106,10 +106,9 @@ RUN patch -d / -p0 < /tmp/bosco_cluster_xtrace.patch
 COPY hosted-ce/overrides/skip_key_copy.patch /tmp
 RUN patch -d / -p0 < /tmp/skip_key_copy.patch
 
-# Fix Ubuntu20 OS detection (SOFTWARE-4463)
-# Can be dropped when HTCONDOR-242 is involved
-COPY hosted-ce/overrides/HTCONDOR-242.remote-os-detection.patch /tmp
-RUN [[ $BASE_YUM_REPO != 'release' ]] || patch -d / -p0 < /tmp/HTCONDOR-242.remote-os-detection.patch
+# Add Scientific Linux OS detection to bosco_cluster (HTCONDOR-503)
+COPY hosted-ce/overrides/HTCONDOR-503.add-sl-support.patch /tmp
+RUN patch -d / -p0 < /tmp/HTCONDOR-503.add-sl-support.patch
 
 # Allow the Gridmanager to specify 'batch_gahp' for its remote command
 # Required for HTCondor 9.0.0 on the CE and Bosco 1.3 usage

hosted-ce/overrides/HTCONDOR-242.remote-os-detection.patch

@@ -0,0 +1,11 @@
+--- /usr/bin/bosco_cluster
++++ /usr/bin/bosco_cluster
+@@ -288,7 +288,7 @@ ssh_detect_linux_distro () {
+     major_ver="${ver%%.*}"
+ 
+     case "$dist" in
+-        (rhel|centos)
++        (rhel|centos|scientific)
+             echo "CentOS${major_ver}" ;;
+         debian)
+             echo "Debian${major_ver}" ;;