Test API first, then applications

.gitlab-ci.yml

@@ -145,10 +145,22 @@ ctest:
     paths:
       - $OTB_BUILD/Testing/Temporary
 
+otbtf_api:
+  stage: Test
+  extends: .tests_base
+  variables:
+    API_TEST_TMP: /tmp/api_tests_tmp
+  script:
+    - mkdir $API_TEST_TMP
+    - TMPDIR=$API_TEST_TMP python -m pytest --junitxml=report_api.xml test/api_unittest.py
+  artifacts:
+    paths:
+      - $API_TEST_TMP
+
 .applications_test_base:
   stage: Applications Test
   extends: .tests_base
-  needs: ["ctest"]
+  needs: ["ctest", "otbtf_api"]
   #when: manual
 
 crc_book:
@@ -163,21 +175,6 @@ crc_book:
     paths:
       - $CRC_BOOK_TMP
 
-sr4rs:
-  extends: .applications_test_base
-  variables:
-    DATASET_S2: https://nextcloud.inrae.fr/s/EZL2JN7SZyDK8Cf/download/sr4rs_sentinel2_bands4328_france2020_savedmodel.zip
-    DATASET_SR4RS: https://nextcloud.inrae.fr/s/kDms9JrRMQE2Q5z/download
-  script:
-    - wget -qO sr4rs_sentinel2_bands4328_france2020_savedmodel.zip $DATASET_S2
-    - unzip -o sr4rs_sentinel2_bands4328_france2020_savedmodel.zip
-    - wget -qO sr4rs_data.zip $DATASET_SR4RS
-    - unzip -o sr4rs_data.zip
-    - rm -rf sr4rs
-    - git clone https://github.com/remicres/sr4rs.git
-    - export PYTHONPATH=$PYTHONPATH:$PWD/sr4rs
-    - python -m pytest --junitxml=report_sr4rs.xml test/sr4rs_unittest.py
-
 decloud:
   extends: .applications_test_base
   allow_failure: true
@@ -190,16 +187,20 @@ decloud:
     - export DECLOUD_DATA_DIR="$PWD/decloud_data"
     - pytest decloud/tests/train_from_tfrecords_unittest.py
 
-otbtf_api:
+sr4rs:
   extends: .applications_test_base
   variables:
-    API_TEST_TMP: /tmp/api_tests_tmp
+    DATASET_S2: https://nextcloud.inrae.fr/s/EZL2JN7SZyDK8Cf/download/sr4rs_sentinel2_bands4328_france2020_savedmodel.zip
+    DATASET_SR4RS: https://nextcloud.inrae.fr/s/kDms9JrRMQE2Q5z/download
   script:
-    - mkdir $API_TEST_TMP
-    - TMPDIR=$API_TEST_TMP python -m pytest --junitxml=report_api.xml test/api_unittest.py
-  artifacts:
-    paths:
-      - $API_TEST_TMP
+    - wget -qO sr4rs_sentinel2_bands4328_france2020_savedmodel.zip $DATASET_S2
+    - unzip -o sr4rs_sentinel2_bands4328_france2020_savedmodel.zip
+    - wget -qO sr4rs_data.zip $DATASET_SR4RS
+    - unzip -o sr4rs_data.zip
+    - rm -rf sr4rs
+    - git clone https://github.com/remicres/sr4rs.git
+    - export PYTHONPATH=$PYTHONPATH:$PWD/sr4rs
+    - python -m pytest --junitxml=report_sr4rs.xml test/sr4rs_unittest.py
 
 geos_enabled:
   extends: .applications_test_base