fixing merge conflict

hashicorp · Apr 24, 2023 · 38bb381 · 38bb381
1 parent 158e575
commit 38bb381
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml
@@ -159,14 +159,7 @@ jobs:
           JQ_SLICER: '[ inputs ] | [_nwise(length / $runnercount | floor)]'
         run: |
           NUM_RUNNERS=$TOTAL_RUNNERS
-<<<<<<< HEAD
-          NUM_DIRS=$(find ./test/integration/connect/envoy -maxdepth 1 -type d | wc -l)
-
-          #remove on for the top level directory
-          NUM_DIRS=$((NUM_DIRS-1))
-=======
           NUM_DIRS=$(find ./test/integration/connect/envoy -mindepth 1 -maxdepth 1 -type d | wc -l)
->>>>>>> f56b25472d (ci: fix runner calculation to exclude the top level directory as part of the calculation (#17090))
 
           if [ "$NUM_DIRS" -lt "$NUM_RUNNERS" ]; then
             echo "TOTAL_RUNNERS is larger than the number of tests/packages to split."
@@ -282,14 +275,7 @@ jobs:
         run: |
           cd ./test/integration/consul-container
           NUM_RUNNERS=$TOTAL_RUNNERS
-<<<<<<< HEAD
-          NUM_DIRS=$(find ./test -maxdepth 2 -type d | wc -l)
-
-          #remove on for the top level directory
-          NUM_DIRS=$((NUM_DIRS-1))
-=======
           NUM_DIRS=$(find ./test -mindepth 1 -maxdepth 2 -type d | wc -l)
->>>>>>> f56b25472d (ci: fix runner calculation to exclude the top level directory as part of the calculation (#17090))
 
           if [ "$NUM_DIRS" -lt "$NUM_RUNNERS" ]; then
             echo "TOTAL_RUNNERS is larger than the number of tests/packages to split."