test: Move test order to allow ci work.

This is a workarrond to allow the ci work until clearcontainers/runtime#902 is fixed Fixes: clearcontainers#835 Signed-off-by: Jose Carlos Venegas Munoz <[email protected]>
jcvenegas · Jan 10, 2018 · 9108c3d · 9108c3d
1 parent bea28b6
commit 9108c3d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/.ci/run.sh b/.ci/run.sh
@@ -16,6 +16,21 @@
 
 set -e
 source /etc/os-release
+start_test="$(date '+%Y-%m-%d %H:%M:%S')"
+last_test="${start_test}"
+
+function cleanup {
+	if (( "$?" != 0 )); then
+		echo "DEBUG: Logs from all test "
+		sudo journalctl -t cc-runtime  --since="${start_test}" --no-pager
+		if [ "${start_test}" != "${last_test}" ]; then
+			echo "DEBUG: Logs from last test"
+			sudo journalctl -t cc-runtime  --since="${last_test}" --no-pager
+		fi
+	fi
+}
+
+trap cleanup EXIT
 
 if [ "$ID" == "ubuntu" ] && [ "$VERSION_ID" == "17.04" ]; then
 	export CRIO_STORAGE_DRIVER_OPTS="--storage-driver=devicemapper"
@@ -26,5 +41,11 @@ sudo -E PATH="$PATH" bash -c "make check"
 # Currently, Openshift tests only work on Fedora.
 # We should delete this condition, when it works for Ubuntu.
 if [ "$ID" == fedora  ]; then
+	last_test=$(date '+%Y-%m-%d %H:%M:%S')
 	sudo -E PATH="$PATH" bash -c "make openshift"
 fi
+
+#FIXME: Running swarm before openshift breaks cc-runtime list
+# see https://github.com/clearcontainers/runtime/issues/902
+last_test=$(date '+%Y-%m-%d %H:%M:%S')
+sudo -E PATH="$PATH" bash -c "make swarm"
diff --git a/Makefile b/Makefile
@@ -51,7 +51,7 @@ swarm:
 conformance:
 	bats conformance/posixfs/fstest.bats
 
-check: functional crio integration swarm conformance
+check: functional crio integration conformance
 
 all: functional checkcommits integration