Disabled OPENCV_TEST_REQUIRE_DATA option in configurations that are n…

…ot ready now.
opencv · Feb 7, 2024 · 4030e55 · 4030e55
1 parent 7848b83
commit 4030e55
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/OCV-PR-4.x-ARM64-Debug.yaml b/.github/workflows/OCV-PR-4.x-ARM64-Debug.yaml
@@ -22,7 +22,7 @@ env:
   GIT_CACHE_DOCKER: '/home/ci/git_cache'
   PYTHONPATH: /home/ci/build/python_loader:$PYTHONPATH
   OPENCV_TEST_DATA_PATH: '/home/ci/opencv_extra/testdata'
-  OPENCV_TEST_REQUIRE_DATA: 1
+  #OPENCV_TEST_REQUIRE_DATA: 1
   OPENCV_DOCKER_WORKDIR: '/home/ci/opencv'
   PARALLEL_JOBS: 16
 
@@ -90,27 +90,27 @@ jobs:
           echo "No merge since ${{ env.PR_AUTHOR }}/opencv_extra does not have branch ${{ env.SOURCE_BRANCH_NAME }}"
         fi
     # download models independently from DNN as some modules are used here and there on other places
-    - name: Extra DNN models update
-      timeout-minutes: 60
-      run: |
-        DOWNLOAD_MODELS_FILE='download_models.py'
-        if [ -f ${{ env.DNN_MODELS }}/dnn/latest-hash-${{ env.TARGET_BRANCH_NAME }}.txt ]; then
-          LATEST_SAVED_HASH=$(cat ${{ env.DNN_MODELS }}/dnn/latest-hash-${{ env.TARGET_BRANCH_NAME }}.txt)
-        else
-          LATEST_SAVED_HASH=""
-        fi
-        LATEST_HASH=$(sha256sum $HOME/opencv_extra/testdata/dnn/$DOWNLOAD_MODELS_FILE | awk '{print $1}')
-        if [[ $LATEST_HASH == $LATEST_SAVED_HASH ]]; then
-          echo "DNN models are up to date"
-          echo "OPENCV_DNN_TEST_DATA_PATH=${{ env.DNN_MODELS }}" >> $GITHUB_ENV
-        else
-          echo "Updating DNN models list"
-          echo "OPENCV_DNN_TEST_DATA_PATH=/home/ci/new-dnn-models" >> $GITHUB_ENV && OPENCV_DNN_TEST_DATA_PATH='/home/ci/new-dnn-models'
-          mkdir -p "$OPENCV_DNN_TEST_DATA_PATH"
-          rsync -a --exclude=$DOWNLOAD_MODELS_FILE ${{ env.DNN_MODELS }}/* $OPENCV_DNN_TEST_DATA_PATH
-          cp $HOME/opencv_extra/testdata/dnn/download_models.py $OPENCV_DNN_TEST_DATA_PATH/dnn
-          cd $OPENCV_DNN_TEST_DATA_PATH/dnn && python3 download_models.py
-        fi
+    #- name: Extra DNN models update
+      #timeout-minutes: 60
+      #run: |
+        #DOWNLOAD_MODELS_FILE='download_models.py'
+        #if [ -f ${{ env.DNN_MODELS }}/dnn/latest-hash-${{ env.TARGET_BRANCH_NAME }}.txt ]; then
+          #LATEST_SAVED_HASH=$(cat ${{ env.DNN_MODELS }}/dnn/latest-hash-${{ env.TARGET_BRANCH_NAME }}.txt)
+        #else
+          #LATEST_SAVED_HASH=""
+        #fi
+        #LATEST_HASH=$(sha256sum $HOME/opencv_extra/testdata/dnn/$DOWNLOAD_MODELS_FILE | awk '{print $1}')
+        #if [[ $LATEST_HASH == $LATEST_SAVED_HASH ]]; then
+          #echo "DNN models are up to date"
+          #echo "OPENCV_DNN_TEST_DATA_PATH=${{ env.DNN_MODELS }}" >> $GITHUB_ENV
+        #else
+          #echo "Updating DNN models list"
+          #echo "OPENCV_DNN_TEST_DATA_PATH=/home/ci/new-dnn-models" >> $GITHUB_ENV && OPENCV_DNN_TEST_DATA_PATH='/home/ci/new-dnn-models'
+          #mkdir -p "$OPENCV_DNN_TEST_DATA_PATH"
+          #rsync -a --exclude=$DOWNLOAD_MODELS_FILE ${{ env.DNN_MODELS }}/* $OPENCV_DNN_TEST_DATA_PATH
+          #cp $HOME/opencv_extra/testdata/dnn/download_models.py $OPENCV_DNN_TEST_DATA_PATH/dnn
+          #cd $OPENCV_DNN_TEST_DATA_PATH/dnn && python3 download_models.py
+        #fi
     - name: Configure OpenCV
       timeout-minutes: 60
       run: |

diff --git a/.github/workflows/OCV-PR-4.x-U20-OpenVINO.yaml b/.github/workflows/OCV-PR-4.x-U20-OpenVINO.yaml
@@ -21,7 +21,7 @@ env:
   GIT_CACHE_DOCKER: '/home/openvino/git_cache'
   PYTHONPATH: /home/openvino/build/python_loader:$PYTHONPATH
   OPENCV_TEST_DATA_PATH: '/home/openvino/opencv_extra/testdata'
-  OPENCV_TEST_REQUIRE_DATA: 1
+  #OPENCV_TEST_REQUIRE_DATA: 1
   OPENCV_DOCKER_WORKDIR: '/home/openvino/opencv'
   DNN_MODELS: '/home/openvino/dnn-models'
   PARALLEL_JOBS: 8