add flux-core v0.31.0 and flux-sched v0.20.0 (#27336)

Update flux-core and flux-sched package.py to include latest releases.

For flux-sched:

 - Add patch to disable false-positive-happy valgrind test
 - pin yaml-cpp to 0.6.3 due to issue described at:
   https://github.com/flux-framework/flux-sched/issues/886

3 files changed, 31 insertions, 2 deletions

diff --git a/var/spack/repos/builtin/packages/flux-core/package.py b/var/spack/repos/builtin/packages/flux-core/package.py
index ffff450594..5423bc0d2f 100644
--- a/var/spack/repos/builtin/packages/flux-core/package.py
+++ b/var/spack/repos/builtin/packages/flux-core/package.py
@@ -19,6 +19,8 @@ class FluxCore(AutotoolsPackage):
     maintainers = ['grondo']
 
     version('master', branch='master')
+
+    version('0.31.0', sha256='a18251de2ca3522484cacfa986df934ba8f98c54586e18940ce5d2c6147a8a7f')
     version('0.30.0', sha256='e51fde4464140367ae4bc1b44f960675ea0a6f58eede3a561cacd8a11ca3e776')
     version('0.29.0', sha256='c13b40e82d66356e75208a689a495ca01f0a013e2e45ac8ea202ed8224987323')
     version('0.28.0', sha256='9a784def7186b0036091bd8d6d8fe5bc3425ab2927e1465e1c9ad266631c285d')
diff --git a/var/spack/repos/builtin/packages/flux-sched/no-valgrind.patch b/var/spack/repos/builtin/packages/flux-sched/no-valgrind.patch
new file mode 100644
index 0000000000..3b828e431e
--- /dev/null
+++ b/var/spack/repos/builtin/packages/flux-sched/no-valgrind.patch
@@ -0,0 +1,19 @@
+diff --git a/t/t5000-valgrind.t b/t/t5000-valgrind.t
+index 08255348..aac546f6 100755
+--- a/t/t5000-valgrind.t
++++ b/t/t5000-valgrind.t
+@@ -6,6 +6,14 @@ test_description='Run broker under valgrind with a small workload'
+ test -n "$FLUX_TESTS_LOGFILE" && set -- "$@" --logfile
+ . `dirname $0`/sharness.sh
+ 
++#  Do not run valgrind test by default unless FLUX_ENABLE_VALGRIND_TEST
++#   is set in environment (e.g. by CI), or the test run run with -d, --debug
++#
++if test -z "$FLUX_ENABLE_VALGRIND_TEST" && test "$debug" = ""; then
++    skip_all='skipping valgrind tests since FLUX_ENABLE_VALGRIND_TEST not set'
++    test_done
++fi
++
+ if ! which valgrind >/dev/null; then
+     skip_all='skipping valgrind tests since no valgrind executable found'
+     test_done
diff --git a/var/spack/repos/builtin/packages/flux-sched/package.py b/var/spack/repos/builtin/packages/flux-sched/package.py
index 20ad0d714c..de1b370258 100644
--- a/var/spack/repos/builtin/packages/flux-sched/package.py
+++ b/var/spack/repos/builtin/packages/flux-sched/package.py
@@ -19,6 +19,7 @@ class FluxSched(AutotoolsPackage):
     maintainers = ['grondo']
 
     version('master', branch='master')
+    version('0.20.0', sha256='1d2074e1458ba1e7a1d4c33341b9f09769559cd1b8c68edc32097e220c4240b8')
     version('0.19.0', sha256='8dffa8eaec95a81286f621639ef851c52dc4c562d365971233bbd91100c31ed2')
     version('0.18.0', sha256='a4d8a6444fdb7b857b26f47fdea57992b486c9522f4ff92d5a6f547d95b586ae')
     version('0.17.0', sha256='5acfcb757e2294a92eaa91be58ba9b42736b88b42d2937de4a78f4642b1c4933')
@@ -42,7 +43,9 @@ class FluxSched(AutotoolsPackage):
     depends_on("py-pyyaml")
     depends_on("libedit")
     depends_on("libxml2@2.9.1:")
-    depends_on("yaml-cpp")
+    # pin yaml-cpp to 0.6.3 due to issue #886
+    # https://github.com/flux-framework/flux-sched/issues/886
+    depends_on("yaml-cpp@0.6.3")
     depends_on("uuid")
     depends_on("pkgconfig")
 
@@ -55,6 +58,7 @@ class FluxSched(AutotoolsPackage):
     depends_on("flux-core@0.28.0:", when='@0.17.0', type=('build', 'run', 'link'))
     depends_on("flux-core@0.29.0:", when='@0.18.0', type=('build', 'run', 'link'))
     depends_on("flux-core@0.30.0:", when='@0.19.0', type=('build', 'run', 'link'))
+    depends_on("flux-core@0.31.0:", when='@0.19.0', type=('build', 'run', 'link'))
     depends_on("flux-core@master", when='@master', type=('build', 'run', 'link'))
 
     # Need autotools when building on master:
@@ -62,6 +66,10 @@ class FluxSched(AutotoolsPackage):
     depends_on("automake", type='build', when='@master')
     depends_on("libtool", type='build', when='@master')
 
+    # Disable t5000-valgrind.t by default due to false positives not yet
+    # in the suppressions file. (This patch will be in v0.21.0)
+    patch('no-valgrind.patch', when='@:0.20.0')
+
     def url_for_version(self, version):
         '''
         Flux uses a fork of ZeroMQ's Collective Code Construction Contract
@@ -103,7 +111,7 @@ class FluxSched(AutotoolsPackage):
             bash = which('bash')
             bash('./autogen.sh')
 
-    @when('@:0.19')
+    @when('@:0.20')
     def patch(self):
         """Fix build with clang@13 and gcc@11"""
         filter_file('NULL', 'nullptr', 'resource/schema/sched_data.hpp')