Merge branch 'master' into V8_9-gt6226-branch

htcondor · Jan 7, 2021 · f4348cd · f4348cd
2 parents a7d6820 + 91464e8
commit f4348cd
Show file tree

Hide file tree

Showing 210 changed files with 5,225 additions and 4,424 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -30,4 +30,4 @@ date-released: TBD
 # Required.
 version: 8.9.11
 # Strongly recommended.  Really ought to correspond to the version above.
-doi: TBD
+doi: 10.5281/zenodo.2579447
diff --git a/bindings/python/htcondor/_deprecation.py b/bindings/python/htcondor/_deprecation.py
@@ -63,12 +63,6 @@ def deprecate_class(message, cls):
 
 
 def deprecate_8_9_8():
-    ## from python-bindings/negotiator.cpp
-    deprecate_class(
-        "Negotiator is deprecated since v8.9.8 and will be removed in a future release.",
-        htcondor.Negotiator,
-    )
-
     ## from python-bindings/log_reader.cpp
 
     # FIXME: deprecate htcondor.EntryType enum

diff --git a/build/cmake/CondorConfigure.cmake b/build/cmake/CondorConfigure.cmake
@@ -917,8 +917,12 @@ endif()
 
 #####################################
 # Do we want to link in libssl and kerberos or dlopen() them at runtime?
-if (LINUX AND NOT WANT_PYTHON_WHEELS)
-	set( DLOPEN_SECURITY_LIBS TRUE )
+if (NOT DEFINED DLOPEN_SECURITY_LIBS)
+	if (LINUX AND NOT WANT_PYTHON_WHEELS)
+		set(DLOPEN_SECURITY_LIBS TRUE)
+	else()
+		set(DLOPEN_SECURITY_LIBS FALSE)
+	endif()
 endif()
 
 ################################################################################
@@ -1060,8 +1064,12 @@ endif()
 
 #####################################
 # Do we want to link in the GSI libraries or dlopen() them at runtime?
-if (HAVE_EXT_GLOBUS AND LINUX AND NOT WANT_PYTHON_WHEELS)
-	set( DLOPEN_GSI_LIBS TRUE )
+if (NOT DEFINED DLOPEN_GSI_LIBS)
+	if (HAVE_EXT_GLOBUS AND LINUX AND NOT WANT_PYTHON_WHEELS)
+		set(DLOPEN_GSI_LIBS TRUE)
+	else()
+		set(DLOPEN_GSI_LIBS FALSE)
+	endif()
 endif()
 
 message(STATUS "********* External configuration complete (dropping config.h) *********")

diff --git a/build/docker/k8s/pool.yaml b/build/docker/k8s/pool.yaml
@@ -23,7 +23,7 @@ spec:
  restartPolicy: Never
  containers:
   - name: cm
-    image: htcondor/cm:8.9.8-el7
+    image: htcondor/cm:8.9.11-el7
     imagePullPolicy: Always
     resources:
       limits:
@@ -49,14 +49,14 @@ spec:
 apiVersion: v1
 kind: Pod
 metadata:
- name: submit2
+ name: submit
  labels:
    htcondor-role: submit
 spec:
  restartPolicy: Never
  containers:
   - name: submit-container
-    image: htcondor/submit:8.9.8-el7
+    image: htcondor/submit:8.9.11-el7
     imagePullPolicy: Always
     resources:
       limits:
@@ -97,7 +97,7 @@ spec:
     spec:
             containers:
              - name: execute
-               image: htcondor/execute:8.9.8-el7
+               image: htcondor/execute:8.9.11-el7
                imagePullPolicy: Always
                resources:
                  limits:

diff --git a/build/packaging/new-debian/changelog b/build/packaging/new-debian/changelog
@@ -1,3 +1,22 @@
+condor (8.9.10-1) stable; urgency=medium
+
+  * Fix bug where negotiator stopped making matches when group quotas are used
+  * Support OAuth, SciTokens, and Kerberos credentials in local universe jobs
+  * The Python schedd.submit method now takes a Submit object
+  * DAGMan can now optionally run a script when a job goes on hold
+  * DAGMan now provides a method for inline jobs to share submit descriptions
+  * Can now add arbitrary tags to condor annex instances
+  * Runs the "singularity test" before running the a singularity job
+
+ -- Tim Theisen <tim@cs.wisc.edu>  Tue, 24 Nov 2020 09:52:13 -0600
+
+condor (8.8.12-1) stable; urgency=medium
+
+  * Added a family of version comparison functions to ClassAds
+  * Increased default Globus proxy key length to meet current NIST guidance
+
+ -- Tim Theisen <tim@cs.wisc.edu>  Sat, 21 Nov 2020 16:40:52 -0600
+
 condor (8.9.9-1) stable; urgency=medium
 
   * The RPM packages requires globus, munge, scitokens, and voms from EPEL

diff --git a/build/packaging/new-debian/control b/build/packaging/new-debian/control
@@ -32,6 +32,7 @@ Build-Depends: autotools-dev,
                libkrb5-dev,
                libldap2-dev | libldap-dev,
                libmunge-dev,
+               libpam0g-dev,
                libpcre3-dev,
                libpq-dev,
                libsqlite3-dev,
@@ -63,7 +64,7 @@ Depends: adduser,
          python,
          python-requests,
          lsb-base (>= 3.0-6),
-         libclassad12 (= ${binary:Version}),
+         libclassad13 (= ${binary:Version}),
          libcom-err2,
          libglobus-callout0,
          libglobus-common0,
@@ -238,7 +239,7 @@ Description: distributed workload management system - debugging symbols
 Package: libclassad-dev
 Architecture: any
 Section: libdevel
-Depends: libclassad12 (= ${binary:Version}),
+Depends: libclassad13 (= ${binary:Version}),
          ${misc:Depends}
 Conflicts: libclassad0-dev
 Replaces: libclassad0-dev
@@ -251,7 +252,7 @@ Description: HTCondor classads expression language - development library
  .
  This package provides the static library and header files.
 
-Package: libclassad12
+Package: libclassad13
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},

diff --git a/build/packaging/new-debian/control.focal b/build/packaging/new-debian/control.focal
@@ -32,6 +32,7 @@ Build-Depends: autotools-dev,
                libkrb5-dev,
                libldap2-dev | libldap-dev,
                libmunge-dev,
+               libpam0g-dev,
                libpcre3-dev,
                libpq-dev,
                libsqlite3-dev,
@@ -60,7 +61,7 @@ Depends: adduser,
          libdate-manip-perl,
          python3,
          lsb-base (>= 3.0-6),
-         libclassad12 (= ${binary:Version}),
+         libclassad13 (= ${binary:Version}),
          libcom-err2,
          libglobus-callout0,
          libglobus-common0,
@@ -235,7 +236,7 @@ Description: distributed workload management system - debugging symbols
 Package: libclassad-dev
 Architecture: any
 Section: libdevel
-Depends: libclassad12 (= ${binary:Version}),
+Depends: libclassad13 (= ${binary:Version}),
          ${misc:Depends}
 Conflicts: libclassad0-dev
 Replaces: libclassad0-dev
@@ -248,7 +249,7 @@ Description: HTCondor classads expression language - development library
  .
  This package provides the static library and header files.
 
-Package: libclassad12
+Package: libclassad13
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},

diff --git a/build/packaging/new-debian/control.stretch b/build/packaging/new-debian/control.stretch
@@ -63,7 +63,7 @@ Depends: adduser,
          python,
          python-requests,
          lsb-base (>= 3.0-6),
-         libclassad12 (= ${binary:Version}),
+         libclassad13 (= ${binary:Version}),
          libcomerr2,
          libglobus-callout0,
          libglobus-common0,
@@ -238,7 +238,7 @@ Description: distributed workload management system - debugging symbols
 Package: libclassad-dev
 Architecture: any
 Section: libdevel
-Depends: libclassad12 (= ${binary:Version}),
+Depends: libclassad13 (= ${binary:Version}),
          ${misc:Depends}
 Conflicts: libclassad0-dev
 Replaces: libclassad0-dev
@@ -251,7 +251,7 @@ Description: HTCondor classads expression language - development library
  .
  This package provides the static library and header files.
 
-Package: libclassad12
+Package: libclassad13
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},

diff --git a/build/packaging/new-debian/control.xenial b/build/packaging/new-debian/control.xenial
@@ -63,7 +63,7 @@ Depends: adduser,
          python,
          python-requests,
          lsb-base (>= 3.0-6),
-         libclassad12 (= ${binary:Version}),
+         libclassad13 (= ${binary:Version}),
          libcomerr2,
          libglobus-callout0,
          libglobus-common0,
@@ -238,7 +238,7 @@ Description: distributed workload management system - debugging symbols
 Package: libclassad-dev
 Architecture: any
 Section: libdevel
-Depends: libclassad12 (= ${binary:Version}),
+Depends: libclassad13 (= ${binary:Version}),
          ${misc:Depends}
 Conflicts: libclassad0-dev
 Replaces: libclassad0-dev
@@ -251,7 +251,7 @@ Description: HTCondor classads expression language - development library
  .
  This package provides the static library and header files.
 
-Package: libclassad12
+Package: libclassad13
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},

diff --git a/...packaging/new-debian/libclassad12.install → ...packaging/new-debian/libclassad13.install b/...packaging/new-debian/libclassad12.install → ...packaging/new-debian/libclassad13.install
diff --git a/build/packaging/srpm/condor.spec b/build/packaging/srpm/condor.spec
@@ -1558,6 +1558,19 @@ fi
 /bin/systemctl try-restart condor.service >/dev/null 2>&1 || :
 
 %changelog
+* Tue Nov 24 2020 Tim Theisen <tim@cs.wisc.edu> - 8.9.10-1
+- Fix bug where negotiator stopped making matches when group quotas are used
+- Support OAuth, SciTokens, and Kerberos credentials in local universe jobs
+- The Python schedd.submit method now takes a Submit object
+- DAGMan can now optionally run a script when a job goes on hold
+- DAGMan now provides a method for inline jobs to share submit descriptions
+- Can now add arbitrary tags to condor annex instances
+- Runs the "singularity test" before running the a singularity job
+
+* Mon Nov 23 2020 Tim Theisen <tim@cs.wisc.edu> - 8.8.12-1
+- Added a family of version comparison functions to ClassAds
+- Increased default Globus proxy key length to meet current NIST guidance
+
 * Mon Oct 26 2020 Tim Theisen <tim@cs.wisc.edu> - 8.9.9-1
 - The RPM packages requires globus, munge, scitokens, and voms from EPEL
 - Improved cgroup memory policy settings that set both hard and soft limit

diff --git a/docs/_images/fair-share.png b/docs/_images/fair-share.png
diff --git a/docs/_images/user-prio1.png b/docs/_images/user-prio1.png
diff --git a/docs/_images/user-prio2.png b/docs/_images/user-prio2.png
diff --git a/docs/_static/css/htcondor-manual.css b/docs/_static/css/htcondor-manual.css
@@ -3,6 +3,10 @@ a.macro {
 	font-size: 90%;
 }
 
+table th p {
+	margin-bottom: 0px;
+}
+
 table.indextable {
 	margin-bottom: 20px;
 }
@@ -13,6 +17,10 @@ table.indextable li {
 	word-wrap: break-word;
 }
 
+.rst-content dl:not(.docutils) dt {
+	display: table-cell;
+}
+
 /* override table width restrictions */
 @media screen and (min-width: 767px) {