Merge pull request #1626 from garlick/flux_job

job-ingest: add ingest module, flux job command, libjob library
flux-framework · Aug 28, 2018 · bf5af45 · bf5af45
2 parents 72a0550 + 8f405a3
commit bf5af45
Show file tree

Hide file tree

Showing 23 changed files with 1,524 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,15 +9,15 @@ matrix:
     - compiler: clang
       env: LUA_VERSION=5.1
     - compiler: gcc
-      env: LUA_VERSION=5.1 COVERAGE=t ARGS="--with-pmix --enable-caliper --enable-pylint"
+      env: LUA_VERSION=5.1 COVERAGE=t ARGS="--with-flux-security --with-pmix --enable-caliper --enable-pylint"
     - compiler: gcc
       env: LUA_VERSION=5.1 T_INSTALL=t
     - compiler: clang
-      env: LUA_VERSION=5.1 CPPCHECK=t ARGS="--with-pmix --enable-sanitizer" CC=clang-3.8 CXX=clang++-3.8
+      env: LUA_VERSION=5.1 CPPCHECK=t ARGS="--with-flux-security --with-pmix --enable-sanitizer" CC=clang-3.8 CXX=clang++-3.8
     - compiler: gcc
-      env: LUA_VERSION=5.2 CC=gcc-4.9 ARGS="--with-pmix" chain_lint=t
+      env: LUA_VERSION=5.2 CC=gcc-4.9 ARGS="--with-flux-security --with-pmix" chain_lint=t
     - compiler: clang
-      env: LUA_VERSION=5.2 ARGS="--with-pmix --enable-caliper" CC=clang-3.8 CXX=clang++-3.8
+      env: LUA_VERSION=5.2 ARGS="--with-flux-security --with-pmix --enable-caliper" CC=clang-3.8 CXX=clang++-3.8
 
 cache:
   directories:

diff --git a/config/x_ac_yamlcpp.m4 b/config/x_ac_yamlcpp.m4
@@ -36,6 +36,8 @@ Add --disable-jobspec, or set the PKG_CONFIG_PATH env var appropriately.])])
         AC_LANG_POP([C++])
         LIBS="$ac_save_LIBS"
         CFLAGS="$ac_save_CFLAGS"
+
+        AC_DEFINE([HAVE_JOBSPEC], [1], [Define to 1 if jobspec is enabled])
     ])
 
     AM_CONDITIONAL([ENABLE_JOBSPEC], [test "x$enable_jobspec" != "xno"])

diff --git a/configure.ac b/configure.ac
@@ -206,6 +206,14 @@ AM_CONDITIONAL([HAVE_MPI], [test "$have_C_mpi" = yes])
 AX_VALGRIND_H
 AX_CODE_COVERAGE
 
+AC_ARG_WITH([flux-security], AS_HELP_STRING([--with-flux-security],
+             [Build with flux-security]))
+AS_IF([test "x$with_flux_security" = "xyes"], [
+    PKG_CHECK_MODULES([FLUX_SECURITY], [flux-security], [], [])
+    AC_DEFINE([HAVE_FLUX_SECURITY], [1], [Define flux-security is available])
+])
+AM_CONDITIONAL([HAVE_FLUX_SECURITY], [test "x$with_flux_security" = "xyes"])
+
 AC_ARG_ENABLE(caliper,
 	[  --enable-caliper[=OPTS]   Use caliper for profiling. [default=no] [OPTS=no/yes]], ,
 	[enable_caliper="no"])
@@ -301,6 +309,7 @@ AC_CONFIG_FILES( \
   src/common/libkvs/Makefile \
   src/common/libkz/Makefile \
   src/common/libjsc/Makefile \
+  src/common/libjob/Makefile \
   src/common/libsubprocess/Makefile \
   src/common/libcompat/Makefile \
   src/common/liboptparse/Makefile \
@@ -332,6 +341,7 @@ AC_CONFIG_FILES( \
   src/modules/aggregator/Makefile \
   src/modules/pymod/Makefile \
   src/modules/userdb/Makefile \
+  src/modules/job-ingest/Makefile \
   src/test/Makefile \
   etc/Makefile \
   etc/flux-core.pc \

diff --git a/src/cmd/Makefile.am b/src/cmd/Makefile.am
@@ -7,7 +7,7 @@ AM_LDFLAGS = \
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir) -I$(top_srcdir)/src/include \
-	$(ZMQ_CFLAGS)
+	$(ZMQ_CFLAGS) $(FLUX_SECURITY_CFLAGS)
 
 AM_CXXFLAGS = \
 	$(WARNING_CXXFLAGS) \
@@ -18,6 +18,7 @@ fluxcmd_ldadd = \
 	$(top_builddir)/src/common/libflux-internal.la \
 	$(top_builddir)/src/common/libflux-core.la \
 	$(top_builddir)/src/common/libflux-optparse.la \
+	$(FLUX_SECURITY_LIBS) \
 	$(ZMQ_LIBS) $(LIBMUNGE) $(LIBPTHREAD) $(LIBDL) $(HWLOC_LIBS)
 
 LDADD = $(fluxcmd_ldadd)
@@ -72,7 +73,8 @@ fluxcmd_PROGRAMS = \
 	flux-comms \
 	flux-kvs \
 	flux-start \
-	flux-jstat
+	flux-jstat \
+	flux-job
 
 if ENABLE_JOBSPEC
 fluxcmd_PROGRAMS += \