Merge pull request #3100 from grondo/build-and-test-fixes

small build/test/doc fixes

.travis.yml

@@ -44,7 +44,6 @@ jobs:
       env:
        - IMG=focal
        - PYTHON_VERSION=3.8
-       - GITHUB_RELEASES_DEPLOY=t
        - DOCKER_TAG=t
     - name: "Ubuntu: gcc-8 --with-flux-security/caliper --enable-content-s3, distcheck"
       stage: test
@@ -54,6 +53,7 @@ jobs:
        - CXX=g++-8
        - ARGS="--with-flux-security --enable-caliper"
        - DISTCHECK=t
+       - GITHUB_RELEASES_DEPLOY=t
        - TEST_CONTENT_S3=t
     - name: "Ubuntu: py3.7, clang-6.0 chain-lint --with-flux-security"
       stage: test

doc/Makefile.am

@@ -240,6 +240,7 @@ MAN3_FILES_SECONDARY = \
 	man3/flux_kvs_txn_unlink.3 \
 	man3/flux_kvs_txn_symlink.3 \
 	man3/flux_kvs_txn_put_raw.3 \
+	man3/flux_kvs_txn_put_treeobj.3 \
 	man3/flux_kvs_namespace_remove.3 \
 	man3/flux_kvs_move.3 \
 	man3/flux_core_version_string.3 \
@@ -265,13 +266,14 @@ MAN7_FILES_PRIMARY = \
 	man7/flux-broker-attributes.7
 
 
-RST_FILES  = $(MAN1_FILES_PRIMARY:.1=.rst)
+RST_FILES  = \
+	$(MAN1_FILES_PRIMARY:.1=.rst) \
 	$(MAN3_FILES_PRIMARY:.3=.rst) \
 	$(MAN5_FILES_PRIMARY:.5=.rst) \
 	$(MAN7_FILES_PRIMARY:.7=.rst)
 
 if ENABLE_DOCS
-dist_man_MANS = $(MAN1_FILES) $(MAN3_FILES) $(MAN5_FILES) $(MAN7_FILES)
+man_MANS = $(MAN1_FILES) $(MAN3_FILES) $(MAN5_FILES) $(MAN7_FILES)
 $(RST_FILES): man1/NODESET.rst \
 	man3/JSON_PACK.rst \
 	man3/JSON_UNPACK.rst
@@ -297,6 +299,7 @@ $(MAN_FILES): conf.py $(RST_FILES)
 
 EXTRA_DIST = \
 	conf.py \
+	index.rst \
 	$(RST_FILES) \
 	man1/NODESET.rst \
 	man3/JSON_PACK.rst \

doc/conf.py

@@ -33,10 +33,6 @@
 SPDX-License-Identifier: LGPL-3.0'''
 author = 'This page is maintained by the Flux community.'
 
-# The full version, including alpha/beta/rc tags
-release = '0.13.0'
-
-
 # -- General configuration ---------------------------------------------------
 
 # Add any paths that contain templates here, relative to this directory.

doc/man3/flux_event_decode.rst

@@ -81,9 +81,9 @@ if the message doesn't have a JSON payload.
 Events propagated to all subscribers. Events will not be received
 without a matching subscription established using ``flux_event_subscribe()``.
 
-.. literalinclude:: JSON_PACK.rst
+.. include:: JSON_PACK.rst
 
-.. literalinclude:: JSON_UNPACK.rst
+.. include:: JSON_UNPACK.rst
 
 
 RETURN VALUE

doc/man3/flux_event_publish.rst

@@ -80,7 +80,7 @@ FLUX_MSGFLAG_PRIVATE
    Indicates that the event should only be visible to the instance owner
    and the sender.
 
-.. literalinclude:: JSON_PACK.rst
+.. include:: JSON_PACK.rst
 
 
 RETURN VALUE

doc/man3/flux_kvs_txn_create.rst

@@ -112,7 +112,7 @@ FLUX_KVS_APPEND
    Append value instead of overwriting it. If the key does not exist,
    it will be created with the value as the initial value.
 
-.. literalinclude:: JSON_PACK.rst
+.. include:: JSON_PACK.rst
 
 
 RETURN VALUE

doc/man3/flux_request_decode.rst

@@ -50,7 +50,7 @@ if the message doesn't have a JSON payload.
 setting *data* and *len* to the payload data and length. The storage for
 the raw payload belongs to *msg* and should not be freed.
 
-.. literalinclude:: JSON_UNPACK.rst
+.. include:: JSON_UNPACK.rst
 
 
 RETURN VALUE

doc/man3/flux_respond.rst

@@ -70,7 +70,7 @@ requests were made with the FLUX_RPC_STREAMING flag by testing the
 FLUX_MSGFLAG_STREAMING flag, e.g. using ``flux_msg_is_streaming()``.
 If the flag is not set, the service must return an immediate EPROTO error.
 
-.. literalinclude:: JSON_PACK.rst
+.. include:: JSON_PACK.rst
 
 
 RETURN VALUE

doc/man3/flux_rpc.rst

@@ -164,9 +164,9 @@ individual RPC, but does stipulate that an RPC may be canceled if a disconnect
 message is received, as is automatically generated by the local connector
 upon client disconnection.
 
-.. literalinclude:: JSON_PACK.rst
+.. include:: JSON_PACK.rst
 
-.. literalinclude:: JSON_UNPACK.rst
+.. include:: JSON_UNPACK.rst
 
 
 RETURN VALUE

t/t3200-instance-restart.t

@@ -13,17 +13,17 @@ fi
 
 test_expect_success 'run a job in persistent instance' '
 	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
-	           flux mini run -v /bin/true 2>&1 | sed "s/jobid: //" >id1.out
+	           flux mini run -v /bin/true 2>&1 | sed -n "s/jobid: //p" >id1.out
 '
 
 test_expect_success 'restart instance and run another job' '
 	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
-	           flux mini run -v /bin/true 2>&1 | sed "s/jobid: //" >>id2.out
+	           flux mini run -v /bin/true 2>&1 | sed -n "s/jobid: //p" >>id2.out
 '
 
 test_expect_success 'restart instance and run another job' '
 	flux start -o,--setattr=content.backing-path=$(pwd)/content.sqlite \
-	           flux mini run -v /bin/true 2>&1 | sed "s/jobid: //" >>id3.out
+	           flux mini run -v /bin/true 2>&1 | sed -n "s/jobid: //p" >>id3.out
 '
 
 test_expect_success 'restart instance and list inactive jobs' '
@@ -47,7 +47,7 @@ test_expect_success 'run a job in persistent instance (content-files)' '
 	flux start \
 	    -o,-Scontent.backing-module=content-files \
 	    -o,-Scontent.backing-path=$(pwd)/content.files \
-	    flux mini run -v /bin/true 2>&1 | sed "s/jobid: //" >files_id1.out
+	    flux mini run -v /bin/true 2>&1 | sed -n "s/jobid: //p" >files_id1.out
 '
 test_expect_success 'restart instance and list inactive jobs' '
 	flux start \
@@ -64,7 +64,7 @@ test_expect_success 'inactive job list contains job from before restart' '
 test_expect_success S3 'run a job in persistent instance (content-s3)' '
 	flux start \
 	    -o,-Scontent.backing-module=content-s3 \
-	    flux mini run -v /bin/true 2>&1 | sed "s/jobid: //" >files_id2.out
+	    flux mini run -v /bin/true 2>&1 | sed -n "s/jobid: //p" >files_id2.out
 '
 test_expect_success S3 'restart instance and list inactive jobs' '
 	flux start \