fix(condo): INFRA-1234 support legacy -d option

condo-bot · sitozzz · commit dd96bef7ad42 · 2026-02-20T08:46:31.000+05:00
diff --git a/.github/workflows/_nodejs.condo.core.tests.yml b/.github/workflows/_nodejs.condo.core.tests.yml
@@ -1,9 +1,12 @@
 on:
   workflow_call:
     inputs:
-      domain_name:
+      shard_index:
         required: true
-        type: string
+        type: number
+      shard_total:
+        required: true
+        type: number
       image_name:
         required: true
         type: string
@@ -56,12 +59,12 @@ jobs:
           -e GH_REF_NAME=$GH_REF_NAME \
           -v ./test_logs:/app/test_logs --network="host" \
           ${{ secrets.DOCKER_REGISTRY }}/${{ inputs.image_name }} \
-          bash -c "./bin/run_condo_domain_tests.sh -d ${{ inputs.domain_name }}"
+          bash -c "./bin/run_condo_domain_tests.sh -s ${{ inputs.shard_index }} -t ${{ inputs.shard_total }}"
         env:
           PROMETHEUS_RW_SERVER_URL: ${{ secrets.K6_PROMETHEUS_RW_SERVER_URL }}
           PROMETHEUS_USER: ${{ secrets.K6_PROMETHEUS_USER }}
           PROMETHEUS_PASSWORD: ${{ secrets.K6_PROMETHEUS_PASSWORD }}
-          GH_REF_NAME: ${{ github.event.pull_request.head.ref || github.ref_name }}
+          GH_REF_NAME: ${{ github.head_ref || github.ref_name }}
 
       - name: Collect docker logs on failure
         if: failure()
@@ -73,7 +76,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: logs-${{ inputs.domain_name }}-${{ env.GITHUB_RUN_ID }}-${{ env.GITHUB_RUN_NUMBER }}
+          name: logs-shard-${{ inputs.shard_index }}-of-${{ inputs.shard_total }}-${{ env.GITHUB_RUN_ID }}-${{ env.GITHUB_RUN_NUMBER }}
           path: |
             ./test_logs/*
             *.log
diff --git a/.github/workflows/nodejs.condo.ci.yml b/.github/workflows/nodejs.condo.ci.yml
@@ -5,8 +5,7 @@ on:
     branches:
       - main
 
-  # NOTE: change pull_request_target to pull_request if you want to change the CI in your branch
-  pull_request_target:
+  pull_request:
     types:
       - opened
       - reopened
@@ -424,25 +423,11 @@ jobs:
       # TODO: remove this back
       fail-fast: false
       matrix:
-        domain:
-          - organization
-          - user
-          - scope
-          - property
-          - acquiring
-          - billing
-          - miniapp
-          - banking
-          - ticket
-          - meter
-          - contact
-          - resident
-          - notification
-          - common
-          - others
+        shard_index: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
     uses: ./.github/workflows/_nodejs.condo.core.tests.yml
     with:
-      domain_name: ${{ matrix.domain }}
+      shard_index: ${{ matrix.shard_index }}
+      shard_total: 16
       runs-on: test-runners
       image_name: ${{ needs.build-image.outputs.DOCKER_IMAGE }}
     secrets: inherit
diff --git a/bin/run_condo_domain_tests.sh b/bin/run_condo_domain_tests.sh
@@ -3,17 +3,62 @@
 set -ex
 
 domain_name=""
+shard_index=""
+shard_total=""
 
 usage() {
-    echo "Usage: $0 -d <domain_name>"
+    echo "Usage: $0 -d <domain_name> | -s <shard_index> -t <shard_total>"
     exit 1
 }
 
-while getopts "d:" opt; do
+setup_and_start_services() {
+    node bin/prepare.js -f condo -r condo -c condo
+
+    export NEWS_ITEMS_SENDING_DELAY_SEC=2
+    export NEWS_ITEM_SENDING_TTL_SEC=2
+    export NODE_OPTIONS="--max_old_space_size=4192"
+    export WORKER_CONCURRENCY=100
+    export DATABASE_POOL_MAX=10
+
+    node -e 'console.log(v8.getHeapStatistics().heap_size_limit/(1024*1024))'
+
+    # NOTE(pahaz): Keystone not in dev mode trying to check dist/admin folder
+    mkdir -p ./apps/condo/dist/admin
+
+    yarn workspace @app/condo start 2>&1 > /app/test_logs/condo.dev.log &
+
+    node bin/wait-apps-apis.js -f condo
+
+    # check migrations
+    yarn workspace @app/condo makemigrations --check &> /dev/null
+
+    source bin/validate-db-schema-ts-to-match-graphql-api.sh
+
+    yarn workspace @app/condo worker 2>&1 > /app/test_logs/condo.worker.log &
+    sleep 3
+
+    # And check background processes!
+    [[ $(jobs | wc -l | tr -d ' ') != '2' ]] && exit 2
+    sleep 3
+}
+
+stop_services() {
+    # Note: we need to stop background worker! because packages tests use the same redis queue
+    kill $(jobs -p) || echo 'background worker and dev server is already killed!'
+    killall node || echo 'no node processes'
+}
+
+while getopts ":d:s:t:" opt; do
     case $opt in
         d)
             domain_name="$OPTARG"
             ;;
+        s)
+            shard_index="$OPTARG"
+            ;;
+        t)
+            shard_total="$OPTARG"
+            ;;
         \?)
             echo "Invalid option: -$OPTARG" >&2
             usage
@@ -25,62 +70,89 @@ while getopts "d:" opt; do
     esac
 done
 
-if [ -z "$domain_name" ]; then
-    echo "-d is a required argument!"
+if [ -n "$domain_name" ] && { [ -n "$shard_index" ] || [ -n "$shard_total" ]; }; then
+    echo "Use either legacy domain mode (-d) or shard mode (-s/-t), not both"
     usage
 fi
 
-node bin/prepare.js -f condo -r condo -c condo
-
-export NEWS_ITEMS_SENDING_DELAY_SEC=2
-export NEWS_ITEM_SENDING_TTL_SEC=2
-export NODE_OPTIONS="--max_old_space_size=4192"
-export WORKER_CONCURRENCY=100
-export DATABASE_POOL_MAX=10
-
-node -e 'console.log(v8.getHeapStatistics().heap_size_limit/(1024*1024))'
-
-# NOTE(pahaz): Keystone not in dev mode trying to check dist/admin folder
-mkdir -p ./apps/condo/dist/admin
-
-yarn workspace @app/condo start 2>&1 > /app/test_logs/condo.dev.log &
+if [ -n "$domain_name" ]; then
+    setup_and_start_services
+
+    if [ "$domain_name" != 'others' ]; then
+        # TESTS
+        yarn workspace @app/condo test --workerIdleMemoryLimit="256MB" --testTimeout=15000 -w=3 --forceExit --silent=false --verbose --bail --testPathPattern '/domains/'$domain_name'/schema/(.*)[.]test.js$' 2>&1 > '/app/test_logs/condo.'$domain_name'.tests.log'
+        # SPECS
+        if [ -n "$(find apps/condo/domains/$domain_name -name '*spec.[j|t]s' 2>/dev/null)" ]; then
+            yarn workspace @app/condo test --workerIdleMemoryLimit="256MB" --testTimeout=15000 -w=2 --forceExit --silent=false --verbose --bail --testPathPattern '/domains/'$domain_name'/(.*)[.]spec.[j|t]s$' 2>&1 > '/app/test_logs/condo.'$domain_name'.specs.log'
+        else
+            echo "Files matching (.*)[.]spec.[j|t]s in directory apps/condo/domains/$domain_name not found! Skipping..."
+        fi
+    else
+        # TESTS
+        yarn workspace @app/condo test --workerIdleMemoryLimit="256MB" --testTimeout=15000 -w=3 --forceExit --silent=false --verbose --bail --testPathPattern '/schema/(.*)[.]test.js$' --testPathIgnorePatterns='/domains/(organization|user|scope|property|acquiring|billing|miniapp|banking|ticket|meter|contact|resident|notification|common)/' 2>&1 > /app/test_logs/condo.others.tests.log
+        yarn workspace @app/condo test --workerIdleMemoryLimit="256MB" --testTimeout=15000 -w=3 --forceExit --silent=false --verbose --bail --testPathPattern '(.*)[.]test.js$' --testPathIgnorePatterns='/schema/(.*)[.]test.js$' 2>&1 > /app/test_logs/condo.5.test.others.log
+        # SPECS
+        yarn workspace @app/condo test --workerIdleMemoryLimit="256MB" --testTimeout=15000 -w=2 --forceExit --silent=false --verbose --bail --testPathPattern '(.*)[.]spec.[j|t]s$' --testPathIgnorePatterns='/domains/(organization|user|scope|property|acquiring|billing|miniapp|banking|ticket|meter|contact|resident|notification|common)/' 2>&1 > /app/test_logs/condo.others.specs.log
+    fi
 
-node bin/wait-apps-apis.js -f condo
+    stop_services
 
-# check migrations
-yarn workspace @app/condo makemigrations --check &> /dev/null
+    if [ "$domain_name" = 'others' ]; then
+        # TODO: INFRA-155 Remove it completely by rewriting a task tests or migrate to jest.setup or smth
+        REDIS_URL='[{"port":7001,"host":"127.0.0.1"},{"port":7002,"host":"127.0.0.1"},{"port":7003,"host":"127.0.0.1"}]' yarn workspace @open-condo/keystone test
+        yarn workspace @app/condo lint-schema
+    fi
 
-source bin/validate-db-schema-ts-to-match-graphql-api.sh
+    exit 0
+fi
 
-yarn workspace @app/condo worker 2>&1 > /app/test_logs/condo.worker.log &
-sleep 3
+if [ -z "$shard_index" ] || [ -z "$shard_total" ]; then
+    echo "-s and -t are required arguments!"
+    usage
+fi
 
-# And check background processes!
-[[ $(jobs | wc -l | tr -d ' ') != '2' ]] && exit 2
-sleep 3
+if ! [[ "$shard_index" =~ ^[0-9]+$ ]] || ! [[ "$shard_total" =~ ^[0-9]+$ ]]; then
+    echo "-s and -t must be positive numbers"
+    exit 1
+fi
 
-if [ $domain_name != "others" ]; then
-    # TESTS
-    yarn workspace @app/condo test --workerIdleMemoryLimit="256MB" --testTimeout=15000 -w=3 --forceExit --silent=false --verbose --bail --testPathPattern '/domains/'$domain_name'/schema/(.*)[.]test.js$' 2>&1 > '/app/test_logs/condo.'$domain_name'.tests.log'
-    # SPECS
-    if [ -n "$(find apps/condo/domains/$domain_name -name '*spec.[j|t]s' 2>/dev/null)" ]; then
-        yarn workspace @app/condo test --workerIdleMemoryLimit="256MB" --testTimeout=15000 -w=2 --forceExit --silent=false --verbose --bail --testPathPattern '/domains/'$domain_name'/(.*)[.]spec.[j|t]s$' 2>&1 > '/app/test_logs/condo.'$domain_name'.specs.log'
-    else
-        echo "Files matching (.*)[.]spec.[j|t]s in directory apps/condo/domains/$domain_name not found! Skipping..."
-    fi
-    # Note: we need to stop background worker! because packages tests use the same redis queue
-    kill $(jobs -p) || echo 'background worker and dev server is already killed!'
-    killall node || echo 'no node processes'
-else
-    # TESTS
-    yarn workspace @app/condo test --workerIdleMemoryLimit="256MB" --testTimeout=15000 -w=3 --forceExit --silent=false --verbose --bail --testPathPattern '/schema/(.*)[.]test.js$' --testPathIgnorePatterns='/domains/(organization|user|scope|property|acquiring|billing|miniapp|banking|ticket|meter|contact|resident|notification|common)/' 2>&1 > /app/test_logs/condo.others.tests.log
-    yarn workspace @app/condo test --workerIdleMemoryLimit="256MB" --testTimeout=15000 -w=3 --forceExit --silent=false --verbose --bail --testPathPattern '(.*)[.]test.js$' --testPathIgnorePatterns='/schema/(.*)[.]test.js$' 2>&1 > /app/test_logs/condo.5.test.others.log
-    # SPECS
-    yarn workspace @app/condo test --workerIdleMemoryLimit="256MB" --testTimeout=15000 -w=2 --forceExit --silent=false --verbose --bail --testPathPattern '(.*)[.]spec.[j|t]s$' --testPathIgnorePatterns='/domains/(organization|user|scope|property|acquiring|billing|miniapp|banking|ticket|meter|contact|resident|notification|common)/' 2>&1 > /app/test_logs/condo.others.specs.log
-    # Note: we need to stop background worker! because packages tests use the same redis queue
-    kill $(jobs -p) || echo 'background worker and dev server is already killed!'
-    killall node || echo 'no node processes'
+if [ "$shard_index" -lt 1 ] || [ "$shard_total" -lt 1 ] || [ "$shard_index" -gt "$shard_total" ]; then
+    echo "Invalid shard values: shard_index=$shard_index shard_total=$shard_total"
+    exit 1
+fi
 
+setup_and_start_services
+
+# TESTS (.test.js)
+yarn workspace @app/condo test \
+    --workerIdleMemoryLimit="256MB" \
+    --testTimeout=15000 \
+    -w=3 \
+    --forceExit \
+    --silent=false \
+    --verbose \
+    --bail \
+    --testPathPattern '(.*)[.]test.js$' \
+    --shard="$shard_index/$shard_total" \
+    2>&1 > "/app/test_logs/condo.shard-${shard_index}-of-${shard_total}.tests.log"
+
+# SPECS (.spec.js|.spec.ts)
+yarn workspace @app/condo test \
+    --workerIdleMemoryLimit="256MB" \
+    --testTimeout=15000 \
+    -w=2 \
+    --forceExit \
+    --silent=false \
+    --verbose \
+    --bail \
+    --testPathPattern '(.*)[.]spec.[j|t]s$' \
+    --shard="$shard_index/$shard_total" \
+    2>&1 > "/app/test_logs/condo.shard-${shard_index}-of-${shard_total}.specs.log"
+
+stop_services
+
+# Run non-domain tests that were previously executed in "others"
+if [ "$shard_index" -eq 1 ]; then
     # TODO: INFRA-155 Remove it completely by rewriting a task tests or migrate to jest.setup or smth
     REDIS_URL='[{"port":7001,"host":"127.0.0.1"},{"port":7002,"host":"127.0.0.1"},{"port":7003,"host":"127.0.0.1"}]' yarn workspace @open-condo/keystone test
     yarn workspace @app/condo lint-schema
