Update test-suite

components/admin/test-suite/SPECS/tests.spec

@@ -8,73 +8,74 @@
 #
 #----------------------------------------------------------------------------eh-
 
+%global __brp_mangle_shebangs_exclude bats
+%undefine __brp_mangle_shebangs
+
 %include %{_sourcedir}/OHPC_macros
 
+%global testuser ohpc-test
+%global homedir %(sed -n "s/^\s*HOME=\s*//p" /etc/default/useradd || echo "/home" )
+
 Summary:   Integration test suite for OpenHPC
 Name:      test-suite%{PROJ_DELIM}
-Version:   2.6.0
+Version:   2.7.0
 Release:   1
 License:   Apache-2.0
 Group:     %{PROJ_NAME}/admin
 BuildArch: noarch
 URL:       https://github.com/openhpc/ohpc/tests
 Source0:   tests-ohpc.tar
+# In the OHPC source root dir, create with "tar -cf tests-ohpc.tar tests/"
 
 BuildRequires:  autoconf%{PROJ_DELIM}
 BuildRequires:  automake%{PROJ_DELIM}
+BuildRequires:  sed, findutils
 
-%global __brp_mangle_shebangs_exclude bats
-%undefine __brp_mangle_shebangs
-
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?sle_version}
 Requires(pre):  shadow
-Requires: python-base
+Requires: python3-base
 %endif
 
-%if 0%{?rhel_version}
+%if 0%{?rhel}
 Requires(pre):  shadow-utils
-Requires: python2
+Requires: python3
 %endif
 
-%define testuser ohpc-test
-
 %description
-
 This package provides a suite of integration tests used by the OpenHPC project
 during continuous integration. Most components can be tested individually, but
 a default configuration is setup to enable collective testing. The test suite
 is made available under an '%{testuser}' user account.
 
+
 %prep
 %setup -n tests-ohpc
+find . -name .gitignore  -exec rm {} \;
 
-%build
 
+%build
 export PATH=/opt/ohpc/pub/utils/autotools/bin:$PATH
 cd tests
 ./bootstrap
 
 
 %install
+mkdir -p %{buildroot}%{homedir}/%{testuser}
+cp -a tests %{buildroot}%{homedir}/%{testuser}/
 
-cd tests
-%{__mkdir_p} %{buildroot}/home/%{testuser}/tests
-cp -a * %{buildroot}/home/%{testuser}/tests
-find %{buildroot}/home/%{testuser}/tests -name .gitignore  -exec rm {} \;
 
 %pre
 getent passwd %{testuser} >/dev/null || \
     /usr/sbin/useradd -U -c "OpenHPC integration test account" \
-    -s /bin/bash -m -b /home %{testuser}
-%if 0%{?suse_version}
+    -s /bin/bash -m -b %{homedir} %{testuser}
 if [ $(getent group singularity) ]; then
-    usermod -a -G singularity ohpc-test
+    usermod -a -G singularity %{testuser}
+fi
+if [ $(getent group geopm) ]; then
+    usermod -a -G geopm %{testuser}
 fi
-%endif
-exit 0
+
 
 %files
 %defattr(-,%{testuser},%{testuser},-)
-%dir /home/%{testuser}
-/home/%{testuser}/tests
-
+%{homedir}/%{testuser}/tests

misc/build_srpm.sh

@@ -52,7 +52,7 @@ SRPM=$(build_srpm "${SPEC}" "${MPI_FAMILY}")
 RESULT=$?
 if [ "${RESULT}" == "1" ]; then
 	echo "Building the SRPM for ${BASE} failed."
-	echo "Trying to fetch Source0"
+	echo "Trying to fetch Sources"
 	"${ROOT}"/misc/get_source.sh "${BASE}"
 fi
 

misc/get_source.sh

@@ -30,15 +30,27 @@ do
 	BASE=$(basename "${file}")
 
 	SOURCES=$(rpmspec --parse --define '_sourcedir ../../..' "${FLAGS[@]}" "${BASE}" | grep Source)
-	for u in ${SOURCES}; do
-		echo "${u}"
-		if [[ "${u}" != *"http"* ]]; then
+	for s in ${SOURCES}; do
+		echo "${s}"
+		# Remove the Source header
+		u=$(awk '{ print $2 }' <<< "${s}")
+		# Special handler for tests and docs
+		if [[ "${u}" == "docs-ohpc.tar" || "${u}" == "tests-ohpc.tar" ]]; then
+            if [ ! -f ../SOURCES/"${u}" ]; then
+                echo Creating "${u}"
+				SOURCEDIR="${PWD%/*}"/SOURCES
+				mkdir -p "${SOURCEDIR}"
+                tar -C ../../../.. -cf "${SOURCEDIR}/${u}" --xform="s#^#${u%.tar}/#" "${u%-ohpc.tar}"
+                continue
+            fi
+        fi
+		# Ignore everything else that's not an http/https download
+		if [[ "${u}" != "http"* ]]; then
 			continue
 		fi
-		u=$(awk '{ print $2 }' <<< "${u}")
-		echo "Trying to get ${u}"
+		echo "Trying to wget ${u}"
 		# Try to download only if newer
-		WGET=$(wget -N -nv -P ../SOURCES "${u}" 2>&1)
+		WGET=$(wget -N -nv -P "../SOURCES" "${u}" 2>&1)
 		# Handling for github URLs with #/ or #$/
 		if grep -E "#[$]?/" <<< "${u}"; then
 			MV_SOURCE=$(echo "${WGET}" | tail -1 | cut -d\  -f6 | sed -e 's/^"//' -e 's/"$//')

misc/shell-functions

@@ -29,7 +29,7 @@ build_srpm() {
 
 	DIR=$(dirname "${1}")
 
-	SRPM=$(rpmbuild -bs --nodeps --define "_sourcedir ${DIR}/../SOURCES" --define "mpi_family ${MPI_FAMILY}" "${SPEC}" 2>/dev/null)
+	SRPM=$(rpmbuild -bs --nodeps --define "_sourcedir ${DIR}/../SOURCES" --define "mpi_family ${MPI_FAMILY}" "${SPEC}")
 	RESULT=$?
 
 	echo "${SRPM}" | tail -1 | awk -F\  '{ print $2 }'

tests/admin/Makefile.am

@@ -2,7 +2,6 @@ TESTS_ENVIRONMENT = BATS_NO_SUMMARY=1
 
 TESTS = init.sh
 
-TESTS  += clustershell
 TESTS  += conman
 TESTS  += genders
 TESTS  += nhc