new make target: test-integration-cli-parallel

Usage: $ make test-integration-cli-parallel

parallel(1) needs to be installed.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>

.dockerignore

@@ -1,4 +1,5 @@
 bundles
+bundles-parallel
 .gopath
 vendor/pkg
 .go-pkg-cache

.gitignore

@@ -13,6 +13,7 @@
 .go-pkg-cache/
 autogen/
 bundles/
+bundles-parallel/
 cmd/dockerd/dockerd
 cmd/docker/docker
 dockerversion/version_autogen.go

Makefile

@@ -96,6 +96,9 @@ deb: build  ## build the deb packages
 docs: ## build the docs
 	$(MAKE) -C docs docs
 
+echo-docker-run: ## echo DOCKER_RUN_DOCKER
+	@echo $(DOCKER_RUN_DOCKER)
+
 help: ## this help
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
 
@@ -129,6 +132,10 @@ test-docker-py: build ## run the docker-py tests
 test-integration-cli: build ## run the integration tests
 	$(DOCKER_RUN_DOCKER) hack/make.sh build-integration-test-binary dynbinary test-integration-cli
 
+test-integration-cli-parallel: build ## run the integration tests in parallel (EXPERIMENTAL)
+	$(DOCKER_RUN_DOCKER) hack/make.sh build-integration-test-binary dynbinary
+	contrib/test-integration-cli-parallel.sh
+
 test-unit: build ## run the unit tests
 	$(DOCKER_RUN_DOCKER) hack/make.sh test-unit
 

contrib/.test-integration-cli-parallel

@@ -0,0 +1,19 @@
+#!/bin/bash
+# ARG1: job number (1..N)
+# ARG2: regexp for test case (e.g. TestRunEchoStdout)
+set -e
+echo "ARGS: $@"
+if [ -z $1 ]; then
+    echo "job number not set"
+    false
+fi
+if [ -z $2 ]; then
+    echo "test regexp not set"
+    false
+fi
+set -x
+mkdir -p bundles-parallel/$1
+# TODO: dedup binaries
+cp -r bundles bundles-parallel/$1
+$(BINDDIR="bundles-parallel/$1/bundles" make --silent echo-docker-run) sh -c "ln -s bundles-parallel/$1/bundles bundles ; KEEPBUNDLE=1 DOCKER_INTEGRATION_TESTS_VERIFIED=1 TESTFLAGS=\"-check.f $2\" hack/make.sh test-integration-cli"
+set +x

contrib/.test-integration-cli-parallel-commands

@@ -0,0 +1,26 @@
+TestA
+TestB
+TestC
+TestD
+TestE
+TestF
+TestG
+TestH
+TestI
+TestJ
+TestK
+TestL
+TestM
+TestN
+TestO
+TestP
+TestQ
+TestR
+TestS
+TestT
+TestU
+TestV
+TestW
+TestX
+TestY
+TestZ

contrib/test-integration-cli-parallel.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+### Usage:
+###     $ sudo apt install parallel
+###     $ ./contrib/test-integration-cli-parallel.sh
+set -e
+
+: ${NJOBS=$(nproc)}
+D=$(pwd)/bundles-parallel
+RUNNER=$(pwd)/contrib/.test-integration-cli-parallel
+INPUT=$(pwd)/contrib/.test-integration-cli-parallel-commands
+PARALLEL=parallel
+
+echo "Running tests in parallel. see $D for results."
+set -x
+rm -rf $D/results $D/joblog
+mkdir -p $D
+$PARALLEL \
+    --jobs $NJOBS \
+    --results $D/results \
+    --joblog  $D/joblog \
+    --arg-file $INPUT \
+    $RUNNER "{#}" "{}"
+set +x

hack/make/.integration-test-helpers

@@ -20,7 +20,7 @@ bundle_test_integration_cli() {
 go_test_dir() {
 	dir=$1
 	precompiled=$2
-	testbinary="$DEST/test.main"
+	testbinary="$ABS_DEST/test.main"
 	testcover=()
 	testcoverprofile=()
 	(

hack/make/build-integration-test-binary

@@ -2,7 +2,7 @@
 set -e
 
 rm -rf "$DEST"
-DEST="$DEST/../test-integration-cli"
+DEST="$ABS_DEST/../test-integration-cli"
 
 if [ -z $DOCKER_INTEGRATION_TESTS_VERIFIED ]; then
 	source ${MAKEDIR}/.integration-test-helpers