fixup! RISC-V: combine nightly builds into single job

opencv · Feb 18, 2025 · 79f9389 · 79f9389
1 parent 83bf5df
commit 79f9389
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/OCV-Nightly-RISCV.yaml b/.github/workflows/OCV-Nightly-RISCV.yaml
@@ -30,7 +30,7 @@ jobs:
   RISC-V:
     runs-on: opencv-ru-lin-riscv
     concurrency:
-      group: OCV-Nightly-RISCV-${{ matrix.version }}-${{ matrix.remote && matrix.host || 'local' }}
+      group: OCV-Nightly-RISCV-${{ matrix.remote && matrix.host || 'local' }}
       cancel-in-progress: false
     strategy:
       fail-fast: false
@@ -128,7 +128,6 @@ jobs:
       uses: ./run-tests
       env:
         OPENCV_TEST_DATA_PATH: '${{ env.HOME }}/opencv_extra/testdata'
-        OPENCV_TEST_REQUIRE_DATA: 1
         OPENCV_TEST_CHECK_OPTIONAL_DATA: 1
       with:
         workdir: '${{ matrix.remote && ''.'' || env.HOME }}'
@@ -138,7 +137,7 @@ jobs:
         suite: "[ 'default' ]"
         filter: "[ '${{ matrix.version }}' ]"
         options: "${{ matrix.version }}"
-        timeout: "20"
+        timeout: "30"
         enable_python: "false"
         enable_java: "false"
         suffix: '${{ matrix.version }}_${{ matrix.branch }}'

diff --git a/run-tests/action.yml b/run-tests/action.yml
@@ -65,15 +65,15 @@ runs:
 
   - if: ${{ always() && fromJSON(inputs.enable_python) }}
     shell: bash
-    working-directory: ${{ inputs.rootdir }}
+    working-directory: ${{ inputs.workdir }}/${{ inputs.builddir }}
     run: |
       echo "::group::Python test"
       python3 ../opencv/modules/python/test/test.py --repo ../opencv -v
       echo "::endgroup::"
 
   - if: ${{ always() && fromJSON(inputs.enable_python) }}
     shell: bash
-    working-directory: ${{ inputs.rootdir }}
+    working-directory: ${{ inputs.workdir }}/${{ inputs.builddir }}
     run: |
       echo "::group::Python app test"
       if [ -f "../opencv/apps/python_app_test.py" ]; then
@@ -86,7 +86,7 @@ runs:
   - if: ${{ always() && fromJSON(inputs.enable_java) }}
     id: java-test
     shell: bash
-    working-directory: ${{ inputs.rootdir }}
+    working-directory: ${{ inputs.workdir }}/${{ inputs.builddir }}
     run: |
       echo "::group::Java test"
       ${{ inputs.wrapper }} python3 ../opencv/modules/ts/misc/run.py . -a -t java

diff --git a/scripts/test-plan-riscv-5.x.json b/scripts/test-plan-riscv-5.x.json
@@ -31,6 +31,9 @@
             ],
             "test_video": [
                 "Video_RunningAvg.accuracy"
+            ],
+            "test_3d": [
+                "Volume/VolumeTestFixture.*/*"
             ]
         },
         "main": {