CORCI-635 test: Create romio tarball

So that an RPM can be created to install the ROMIO tests.

Signed-off-by: Brian J. Murrell <[email protected]>

Author: brianjmurrell

Jenkinsfile

@@ -44,4 +44,7 @@
 // no pmix for leap15 yet
 packageBuildingPipeline(['distros' : ['centos7'],
                          'publish_branch': 'daos_adio-rpm',
-                         'make args' : '-f Makefile-rpm.mk'])
+                         'make args' : 'CHROOT=true -f Makefile-rpm.mk',
+                         'add_make_targets': 'romio-tarball',
+                         'add_archiving_cmds': 'mv romio-*.tar.gz artifacts/',
+                         'add_artifacts': 'artifacts/romio-*.tar.gz'])

Makefile-rpm.mk

@@ -111,3 +111,35 @@ $(NAME)-$(DL_VERSION).tar.$(SRC_EXT): $(NAME)-$(DL_VERSION)-$(GIT_COMMIT).tar
 	fi
 	rm -f $@
 	gzip < $< > $@
+
+CHROOT      ?= false
+CHROOT_NAME ?= epel-7-x86_64
+
+romio-$(VERSION).tar.gz: FORCE
+	set -e;                                                              \
+	if $(CHROOT); then                                                   \
+	    romio_prefix=/var/lib/mock/$(CHROOT_NAME)/root/builddir/build;   \
+	    chroot_romio_prefix=/builddir/build;                             \
+	else                                                                 \
+	    romio_prefix=_topdir;                                            \
+	fi;                                                                  \
+	romio_dir=BUILD/mpich-$(VERSION)/src/mpi/romio;                      \
+	if grep "MPI_LIB = /" $$romio_prefix/$$romio_dir/test/Makefile; then \
+	    trap 'mv $$romio_prefix/$$romio_dir/test/Makefile{.old,}' EXIT;  \
+	    mv $$romio_prefix/$$romio_dir/test/Makefile{,.old};              \
+	    sed -e 's/\(MPI_LIB = \)\/\(.*\)/\1-L\/\2/'                      \
+	        < $$romio_prefix/$$romio_dir/test/Makefile.old               \
+	        > $$romio_prefix/$$romio_dir/test/Makefile;                  \
+	fi;                                                                  \
+	if $(CHROOT); then                                                   \
+	    mock -r $(CHROOT_NAME) --chroot                                  \
+	        "make -C $$chroot_romio_prefix/$$romio_dir clean";           \
+	else                                                                 \
+	    make -C $$romio_prefix/$$romio_dir clean;                        \
+	fi;                                                                  \
+	tar -C $$romio_prefix/$$romio_dir/.. --exclude Makefile.old          \
+	    -czf romio-$(VERSION).tar.gz romio
+
+romio-tarball: romio-$(VERSION).tar.gz
+
+.PHONY: romio-tarball

mpich.spec

@@ -1,7 +1,7 @@
 Summary:        A high-performance implementation of MPI
 Name:           mpich
 Version:        3.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        MIT
 URL:            http://www.mpich.org/
 
@@ -90,6 +90,7 @@ Provides:       %{name}-devel-static = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       gcc-gfortran
+Requires:       daos-devel
 %if (0%{?fedora} >= 30)
 Requires:       rpm-mpi-hooks
 %endif
@@ -334,6 +335,9 @@ make check VERBOSE=1
 %{python3_sitearch}/%{name}.pth
 
 %changelog
+* Thu Nov 28 2019 Brian J. Murrell <[email protected]> - 3.3-4
+- mpich-devel should Requires: daos-devel
+
 * Fri Nov 22 2019 Brian J. Murrell <[email protected]> - 3.3-3
 - Rebuild with newer CaRT SO version