X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fci.sh;h=d90c2cd108a2086b4ac2f5a7ec52ba4c532b2695;hb=5cdd77aa817fc3aa7807c4c5ccb866d29b6dfd6e;hp=c735c8d5ca95054c184a8e9997962c2d99bcadd8;hpb=f9d2deae3a826b2f3fdcb6d0b29ef06f21a93c61;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/ci.sh b/scripts/ci.sh
index c735c8d5c..d90c2cd10 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -10,41 +10,48 @@ fi
 killall -q peertube || true
 
 retries=3
-jobs=2
 
 runTest () {
-    retries=3
+    jobname=$1
+    shift
+
     jobs=$1
     shift
+
     files=$@
 
     echo $files
 
-    parallel -t -j $jobs --retries $retries \
-        npm run mocha -- -c --timeout 30000 --exit --require ts-node/register --require tsconfig-paths/register --bail \
+    joblog="$jobname-ci.log"
+
+    parallel -j $jobs --retries $retries \
+        "echo Trying {} >> $joblog; npm run mocha -- -c --timeout 30000 --exit --require ts-node/register --require tsconfig-paths/register --bail {}" \
         ::: $files
+
+    cat "$joblog" | uniq -c
+    rm "$joblog"
 }
 
 findTestFiles () {
-    find $1 -type f -name "*.ts" | grep -v index.ts | xargs echo
+    find $1 -type f -name "*.ts" | grep -v "/index.ts" | xargs echo
 }
 
 if [ "$1" = "misc" ]; then
-    npm run build -- --light
+    npm run build
 
     feedsFiles=$(findTestFiles server/tests/feeds)
     helperFiles=$(findTestFiles server/tests/helpers)
     pluginsFiles=$(findTestFiles server/tests/plugins)
     miscFiles="server/tests/client.ts server/tests/misc-endpoints.ts"
 
-    TS_NODE_FILES=true MOCHA_PARALLEL=true runTest 2 $feedsFiles $helperFiles $pluginsFiles $miscFiles
+    TS_NODE_FILES=true runTest "$1" 1 $feedsFiles $helperFiles $pluginsFiles $miscFiles
 elif [ "$1" = "cli" ]; then
     npm run build:server
     npm run setup:cli
 
     cliFiles=$(findTestFiles server/tests/cli)
 
-    runTest 1 $cliFiles
+    runTest "$1" 1 $cliFiles
 elif [ "$1" = "api-1" ]; then
     npm run build:server
 
@@ -52,20 +59,21 @@ elif [ "$1" = "api-1" ]; then
     notificationsFiles=$(findTestFiles server/tests/api/notifications)
     searchFiles=$(findTestFiles server/tests/api/search)
 
-    MOCHA_PARALLEL=true runTest 2 $notificationsFiles $searchFiles $checkParamFiles
+    MOCHA_PARALLEL=true runTest "$1" 3 $notificationsFiles $searchFiles $checkParamFiles
 elif [ "$1" = "api-2" ]; then
     npm run build:server
 
     serverFiles=$(findTestFiles server/tests/api/server)
     usersFiles=$(findTestFiles server/tests/api/users)
+    liveFiles=$(findTestFiles server/tests/api/live)
 
-    MOCHA_PARALLEL=true runTest 2 $serverFiles $usersFiles
+    MOCHA_PARALLEL=true runTest "$1" 3 $serverFiles $usersFiles $liveFiles
 elif [ "$1" = "api-3" ]; then
     npm run build:server
 
     videosFiles=$(findTestFiles server/tests/api/videos)
 
-    MOCHA_PARALLEL=true runTest 2 $videosFiles
+    MOCHA_PARALLEL=true runTest "$1" 3 $videosFiles
 elif [ "$1" = "api-4" ]; then
     npm run build:server
 
@@ -73,13 +81,13 @@ elif [ "$1" = "api-4" ]; then
     redundancyFiles=$(findTestFiles server/tests/api/redundancy)
     activitypubFiles=$(findTestFiles server/tests/api/activitypub)
 
-    MOCHA_PARALLEL=true TS_NODE_FILES=true runTest 2 $activitypubFiles $redundancyFiles $activitypubFiles
+    MOCHA_PARALLEL=true TS_NODE_FILES=true runTest "$1" 2 $activitypubFiles $redundancyFiles $activitypubFiles
 elif [ "$1" = "external-plugins" ]; then
     npm run build:server
 
     externalPluginsFiles=$(findTestFiles server/tests/external-plugins)
 
-    runTest 1 $externalPluginsFiles
+    runTest "$1" 1 $externalPluginsFiles
 elif [ "$1" = "lint" ]; then
     npm run eslint -- --ext .ts "server/**/*.ts" "shared/**/*.ts" "scripts/**/*.ts"
     npm run swagger-cli -- validate support/doc/api/openapi.yaml