Cleanup unused files

.env_dev

@@ -210,4 +210,4 @@ UPSERT_CHUNK_SIZE= 100
 UPSERT_LIMIT_ERROR_LOG=100
 
 # Enable or not the XLSX / XLS upload
-XLSX_UPLOAD_ENABLED=False
+XLSX_UPLOAD_ENABLED=False

.env_test

@@ -1,7 +1,7 @@
-COMPOSE_PROJECT_NAME=geonode
+COMPOSE_PROJECT_NAME=geonode_test
 # See https://github.com/containers/podman/issues/13889
 # DOCKER_BUILDKIT=0
-DOCKER_ENV=production
+DOCKER_ENV=test
 BACKUPS_VOLUME_DRIVER=local
 
 C_FORCE_ROOT=1

.github/workflows/run-test-suite.yml

@@ -28,20 +28,20 @@ jobs:
         run: docker load -i docker_images/django.tar
 
       - name: Start the stack
-        run: docker compose --env-file .env_test -f docker-compose-test.yml up -d
+        run: ENVIRONMENT=test docker compose up -d --no-deps db geoserver django nginx data-dir-conf
 
       - name: Setup test databases
         run: |
-          docker compose --env-file .env_test -f docker-compose-test.yml exec db psql -U postgres -c "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid();"
-          docker compose --env-file .env_test -f docker-compose-test.yml exec db createdb -U postgres -T postgres test_postgres
-          docker compose --env-file .env_test -f docker-compose-test.yml exec db createdb -U postgres -T postgres test_geonode
-          docker compose --env-file .env_test -f docker-compose-test.yml exec db createdb -U postgres -T postgres test_geonode_data
-          docker compose --env-file .env_test -f docker-compose-test.yml exec db psql -U postgres -d test_geonode -c "CREATE EXTENSION IF NOT EXISTS postgis;"
-          docker compose --env-file .env_test -f docker-compose-test.yml exec db psql -U postgres -d test_geonode_data -c "CREATE EXTENSION IF NOT EXISTS postgis;"
+          ENVIRONMENT=test docker compose exec db psql -U postgres -c "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid();"
+          ENVIRONMENT=test docker compose exec db createdb -U postgres -T postgres test_postgres
+          ENVIRONMENT=test docker compose exec db createdb -U postgres -T postgres test_geonode
+          ENVIRONMENT=test docker compose exec db createdb -U postgres -T postgres test_geonode_data
+          ENVIRONMENT=test docker compose exec db psql -U postgres -d test_geonode -c "CREATE EXTENSION IF NOT EXISTS postgis;"
+          ENVIRONMENT=test docker compose exec db psql -U postgres -d test_geonode_data -c "CREATE EXTENSION IF NOT EXISTS postgis;"
 
       - name: Run ${{ inputs.suite_name }}
         run: |
-          docker compose --env-file .env_test -f docker-compose-test.yml exec -T django bash -s <<'BASH'
+          ENVIRONMENT=test docker compose exec -T django bash -s <<'BASH'
           set -euo pipefail
           ${{ inputs.test_command }}
           BASH
@@ -52,8 +52,8 @@ jobs:
 
       - name: Codecov
         run: |
-          docker compose --env-file .env_test -f docker-compose-test.yml exec django bash -c "bash <(curl -s https://codecov.io/bash) -t 2c0e7780-1640-45f0-93a3-e103b057d8c8"
+          ENVIRONMENT=test docker compose exec django bash -c "bash <(curl -s https://codecov.io/bash) -t 2c0e7780-1640-45f0-93a3-e103b057d8c8"
 
       - name: Stop the stack
         if: always()
-        run: docker compose --env-file .env_test -f docker-compose-test.yml down -v
+        run: ENVIRONMENT=test docker compose down -v

.github/workflows/tests.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Build all services (Docker Compose v2)
-        run: docker compose --env-file .env_test -f docker-compose-test.yml build --progress plain
+        run: ENVIRONMENT=test docker compose build db geoserver django nginx data-dir-conf --progress plain
 
       - name: Save built Docker images
         run: |
@@ -42,7 +42,7 @@ jobs:
     with:
       suite_name: "Smoke Tests"
       test_command: >
-        ./tests/test.sh geonode.tests.smoke geonode.tests.test_rest_api geonode.tests.test_search
+        ./test.sh geonode.tests.smoke geonode.tests.test_rest_api geonode.tests.test_search
         geonode.tests.test_utils geonode.tests.test_headers --duration=30 --failfast
 
   main:
@@ -53,7 +53,7 @@ jobs:
       test_command: >
         TESTS=$(python -c 'import sys; from geonode import settings; print(" ".join([a + ".tests"
         for a in settings.GEONODE_APPS if "security" not in a and "geoserver" not in a and "upload" not in a]))') &&
-        ./tests/test.sh $TESTS geonode.thumbs.tests geonode.people.tests geonode.people.socialaccount.providers.geonode_openid_connect.tests --duration=30 --failfast
+        ./test.sh $TESTS geonode.thumbs.tests geonode.people.tests geonode.people.socialaccount.providers.geonode_openid_connect.tests --duration=30 --failfast
 
   security:
     uses: ./.github/workflows/run-test-suite.yml
@@ -63,7 +63,7 @@ jobs:
       test_command: >
         TESTS=$(python -c 'import sys; from geonode import settings; print(" ".join([a + ".tests"
         for a in settings.GEONODE_APPS if "security" in a]))') &&
-        ./tests/test.sh $TESTS --duration=30 --failfast
+        ./test.sh $TESTS --duration=30 --failfast
 
   gis_backend:
     uses: ./.github/workflows/run-test-suite.yml
@@ -73,15 +73,15 @@ jobs:
       test_command: >
         TESTS=$(python -c 'import sys; from geonode import settings; print(" ".join([a + ".tests"
         for a in settings.GEONODE_APPS if "geoserver" in a]))') &&
-        ./tests/test.sh $TESTS --duration=30 --failfast
+        ./test.sh $TESTS --duration=30 --failfast
 
   rest_apis:
     uses: ./.github/workflows/run-test-suite.yml
     needs: [build_images, smoke]
     with:
       suite_name: "REST API Tests"
       test_command: >
-        ./tests/test.sh geonode.api.tests geonode.base.api.tests geonode.layers.api.tests
+        ./test.sh geonode.api.tests geonode.base.api.tests geonode.layers.api.tests
         geonode.maps.api.tests geonode.documents.api.tests geonode.geoapps.api.tests --duration=30 --failfast
 
   csw:
@@ -90,15 +90,15 @@ jobs:
     with:
       suite_name: "CSW Tests"
       test_command: >
-        ./tests/test.sh geonode.tests.csw geonode.catalogue.backends.tests --duration=30 --failfast
+        ./test.sh geonode.tests.csw geonode.catalogue.backends.tests --duration=30 --failfast
 
   upload:
     uses: ./.github/workflows/run-test-suite.yml
     needs: [build_images, smoke]
     with:
       suite_name: "Upload Tests"
       test_command: >
-        ./tests/test.sh geonode.upload --duration=30 --failfast
+        ./test.sh geonode.upload --duration=30 --failfast
 
   # -------------------------------------------------
   # CLEANUP JOB: REMOVE ALL ARTIFACTS AT THE END