From 938027117cdb2f300ee772ab27f008cbe22a4b19 Mon Sep 17 00:00:00 2001 From: Unitech Date: Mon, 26 Feb 2018 20:46:11 +0100 Subject: [PATCH] refactor e2e one line parallel --- test/Dockerfile | 2 ++ test/docker_parallel_test.sh | 17 +---------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/test/Dockerfile b/test/Dockerfile index 4979fe06c..ee1a9ecb2 100644 --- 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 mocha@3.5 diff --git a/test/docker_parallel_test.sh b/test/docker_parallel_test.sh index 1b9ffe351..da37de237 100644 --- 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