refactor e2e one line parallel

Unitech · Feb 26, 2018 · 9380271 · 9380271
1 parent 8a7db95
commit 9380271
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/test/Dockerfile b/test/Dockerfile
@@ -5,6 +5,8 @@ RUN mkdir -p /var/pm2
 WORKDIR /var/pm2
 
 ENV NODE_ENV test
+ENV PM2_DISCRETE_MODE true
+
 RUN apk update && apk add bash git curl python3 php5 && rm -rf /var/cache/apk/*
 RUN ln -s /usr/bin/php5 /usr/bin/php
 RUN npm install -g [email protected]

diff --git a/test/docker_parallel_test.sh b/test/docker_parallel_test.sh
@@ -5,19 +5,4 @@ docker build -t pm2-test -f test/Dockerfile .
 JOBS=20
 OPTS="--jobs $JOBS --joblog joblog-X docker run -v `pwd`:/var/pm2 pm2-test"
 
-# process-file ok
-ls test/e2e/process-file/* | parallel $OPTS bash
-# cli ok
-ls test/e2e/cli/* | parallel $OPTS bash
-# logs ok
-ls test/e2e/logs/* | parallel $OPTS bash
-# reload ok
-ls test/e2e/reload/* | parallel $OPTS bash
-# internals ok
-ls test/e2e/internal/* | parallel $OPTS bash
-# modules ok
-ls test/e2e/modules/* | parallel $OPTS bash
-# binaries ok
-ls test/e2e/binaries/* | parallel $OPTS bash
-
-# misc
+ls test/e2e/binaries/* test/e2e/modules/* test/e2e/internal/* test/e2e/reload/* test/e2e/process-file/* test/e2e/cli/* test/e2e/logs/* | parallel $OPTS bash