Merge pull request #2726 from PnX-SI/refact/remove-populate-db-test

remove 03b_populate_db_for_test.sh
PnX-SI · Sep 28, 2023 · 8cec8a9 · 8cec8a9
2 parents 4f125e8 + 3357a05
commit 8cec8a9
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -73,9 +73,15 @@ jobs:
         working-directory: ./backend
       - name: Install database
         run: |
-          install/03b_populate_db_for_test.sh
+          install/03b_populate_db.sh
         env:
           GEONATURE_CONFIG_FILE: config/test_config.toml
+          srid_local: 2154
+          install_bdc_statuts: true
+          add_sample_data: true
+          install_sig_layers: true
+          install_grid_layer_5: true
+          install_ref_sensitivity: true
         # FRONTEND
       - name: Cache node modules
         uses: actions/cache@v3

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -89,9 +89,15 @@ jobs:
           GEONATURE_CONFIG_FILE: config/test_config.toml
       - name: Install database
         run: |
-          install/03b_populate_db_for_test.sh
+          install/03b_populate_db.sh
         env:
           GEONATURE_CONFIG_FILE: config/test_config.toml
+          srid_local: 2154
+          install_bdc_statuts: true
+          add_sample_data: true
+          install_sig_layers: true
+          install_grid_layer_5: true
+          install_ref_sensitivity: true
       - name: Show database status
         run: |
           geonature db status

diff --git a/install/03b_populate_db.sh b/install/03b_populate_db.sh
@@ -25,10 +25,16 @@ then
     geonature db upgrade ref_geo_fr_regions@head
 fi
 
-if [ "$install_grid_layer" = true ];
+if [ "$install_grid_layer" = true ] || [ "$install_grid_layer_1" = true ];
 then
     geonature db upgrade ref_geo_inpn_grids_1@head
+fi
+if [ "$install_grid_layer" = true ] || [ "$install_grid_layer_5" = true ];
+then
     geonature db upgrade ref_geo_inpn_grids_5@head
+fi
+if [ "$install_grid_layer" = true ] || [ "$install_grid_layer_10" = true ];
+then
     geonature db upgrade ref_geo_inpn_grids_10@head
 fi
 

diff --git a/install/03b_populate_db_for_test.sh b/install/03b_populate_db_for_test.sh