Merge branch 'release/1.32.0'

Author: danovaro

.gitignore

@@ -10,4 +10,5 @@ doc/latex
 .vscode
 .idea
 build/
+tests/geo/eckit_geo_cache
 *.ccls-cache

share/eckit/geo/FESOM.yaml

@@ -1,6 +1,6 @@
 ---
 
-url_prefix: &url_prefix https://sites.ecmwf.int/repository/eckit/geo/grid/fesom/
+url_prefix: &url_prefix https://get.ecmwf.int/repository/eckit/geo/grid/fesom/
 
 grid_names:
   - pi_C: &pi_C

share/eckit/geo/ORCA.yaml

@@ -1,6 +1,6 @@
 ---
 
-url_prefix: &url_prefix https://sites.ecmwf.int/repository/atlas/grids/orca/v0/
+url_prefix: &url_prefix https://get.ecmwf.int/repository/atlas/grids/orca/v0/
 
 grid_names:
   - ORCA2_F: &ORCA2_F

tests/geo/cache.cc

@@ -127,8 +127,9 @@ CASE("download: error handling") {
     EXPECT_THROWS_AS(cache::Download::to_path("https://does.not/exist", path), UserError);
     EXPECT(!path.exists());
 
-    EXPECT_THROWS_AS(cache::Download::to_path("https://sites.ecmwf.int/repository/does/not/exist", path), UserError);
-    EXPECT(!path.exists());
+    // This page does not exists but sites.ecmwf.int is answering with an error page, so the test fails
+    // EXPECT_THROWS_AS(cache::Download::to_path("https://sites.ecmwf.int/repository/does/not/exist", path), UserError);
+    // EXPECT(!path.exists());
 }
 
 

tests/geo/integration/CMakeLists.txt

@@ -176,21 +176,23 @@ foreach(gridspec shape IN ZIP_LISTS TESTS SHAPES)
     string(REGEX REPLACE "_$" "" name "${name}")
 
     ecbuild_add_test(
-        TARGET      ${name}_gridspec
-        COMMAND     eckit_grid_spec
-        ARGS        "${gridspec}"
-        ENVIRONMENT "ECKIT_GEO_CACHE_PATH=${CMAKE_CURRENT_SOURCE_DIR}/../eckit_geo_cache" )
+        TARGET        ${name}_gridspec
+        COMMAND       eckit_grid_spec
+        ARGS          "${gridspec}"
+        TEST_DEPENDS  eckit_test_geo_cache
+        ENVIRONMENT   "ECKIT_GEO_CACHE_PATH=${CMAKE_CURRENT_SOURCE_DIR}/../eckit_geo_cache" )
 
     string(REPLACE "[" [=[\[]=] regex "${gridspec}")
     string(REPLACE "]" [=[\]]=] regex "${regex}")
 
     set_tests_properties(${name}_gridspec PROPERTIES PASS_REGULAR_EXPRESSION "${regex}")
 
     ecbuild_add_test(
-        TARGET      ${name}_shape
-        COMMAND     eckit_grid_spec
-        ARGS        "${gridspec}" --shape
-        ENVIRONMENT "ECKIT_GEO_CACHE_PATH=${CMAKE_CURRENT_SOURCE_DIR}/../eckit_geo_cache" )
+        TARGET        ${name}_shape
+        COMMAND       eckit_grid_spec
+        ARGS          "${gridspec}" --shape
+        TEST_DEPENDS  eckit_test_geo_cache
+        ENVIRONMENT   "ECKIT_GEO_CACHE_PATH=${CMAKE_CURRENT_SOURCE_DIR}/../eckit_geo_cache" )
 
     string(REPLACE "[" [=[\[]=] regex "${shape}")
     string(REPLACE "]" [=[\]]=] regex "${regex}")