fix runner calculation to exclude the top level directory as part of …

…the calculation
hashicorp · Apr 21, 2023 · 07d9aeb · 07d9aeb
1 parent a011d8c
commit 07d9aeb
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml
@@ -159,10 +159,14 @@ jobs:
           JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
         run: |
           NUM_RUNNERS=$TOTAL_RUNNERS
-          NUM_DIRS=$(find ./test/integration/connect/envoy -maxdepth 1 -type d | wc -l)
+          NUM_DIRS=$(find ./test -maxdepth 2 -type d | wc -l)
+          
+          #remove on for the top level directory
+          NUM_DIRS=$((NUM_DIRS-1))
+
           if [ "$NUM_DIRS" -lt "$NUM_RUNNERS" ]; then
             echo "TOTAL_RUNNERS is larger than the number of tests/packages to split."
-            NUM_RUNNERS=$NUM_DIRS
+            NUM_RUNNERS=$((NUM_DIRS-1))
           fi
           # fix issue where test splitting calculation generates 1 more split than TOTAL_RUNNERS.
           NUM_RUNNERS=$((NUM_RUNNERS-1))
@@ -274,9 +278,13 @@ jobs:
           cd ./test/integration/consul-container
           NUM_RUNNERS=$TOTAL_RUNNERS
           NUM_DIRS=$(find ./test -maxdepth 2 -type d | wc -l)
+          
+          #remove on for the top level directory
+          NUM_DIRS=$((NUM_DIRS-1))
+
           if [ "$NUM_DIRS" -lt "$NUM_RUNNERS" ]; then
             echo "TOTAL_RUNNERS is larger than the number of tests/packages to split."
-            NUM_RUNNERS=$NUM_DIRS
+            NUM_RUNNERS=$((NUM_DIRS-1))
           fi
           # fix issue where test splitting calculation generates 1 more split than TOTAL_RUNNERS.
           NUM_RUNNERS=$((NUM_RUNNERS-1))
@@ -378,10 +386,14 @@ jobs:
         run: |
           cd ./test/integration/consul-container/test/upgrade
           NUM_RUNNERS=$TOTAL_RUNNERS
-          NUM_DIRS=$(go test ./...  -list=. -json | jq -r '.Output | select (. !=null) |  select(. | startswith("Test")) | gsub("[\\n\\t]"; "")' | wc -l)
+          NUM_DIRS=$(find ./test -maxdepth 2 -type d | wc -l)
+          
+          #remove on for the top level directory
+          NUM_DIRS=$((NUM_DIRS-1))
+
           if [ "$NUM_DIRS" -lt "$NUM_RUNNERS" ]; then
             echo "TOTAL_RUNNERS is larger than the number of tests/packages to split."
-            NUM_RUNNERS=$NUM_DIRS
+            NUM_RUNNERS=$((NUM_DIRS-1))
           fi
           # fix issue where test splitting calculation generates 1 more split than TOTAL_RUNNERS.
           NUM_RUNNERS=$((NUM_RUNNERS-1))