refactor(ci): reorganize E2E testing scripts

.github/workflows/develop.yml

@@ -29,7 +29,6 @@ jobs:
       - uses: taiki-e/install-action@nextest
       - name: Test Coverage
         run: cargo llvm-cov nextest
-      - name: E2E Tests with SQLite
-        run: ./docker/bin/run-e2e-tests.sh
-      - name: E2E Tests with MySQL
-        run: ./docker/bin/e2e/mysql/run-e2e-tests.sh
+      - name: E2E Tests
+        run: ./docker/bin/e2e/run-e2e-tests.sh
+

docker/bin/e2e/mysql/e2e-env-reset.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-./docker/bin/e2e/mysql/e2e-env-down.sh
-
 # Delete the databases and recreate them.
 
+docker compose down
+
 # Index Backend
 
 # Database credentials

docker/bin/e2e/mysql/e2e-env-restart.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-./docker/bin/e2e/mysql/e2e-env-down.sh
+docker compose down
 ./docker/bin/e2e/mysql/e2e-env-up.sh

docker/bin/e2e/mysql/run-e2e-tests.sh → docker/bin/e2e/run-e2e-tests.sh

@@ -35,12 +35,39 @@ wait_for_container_to_be_healthy() {
     return 1
 }
 
-# Install tool to create torrent files
+# Install tool to create torrent files.
+# It's needed by some tests to generate and parse test torrent files.
 cargo install imdl || exit 1
 
+# Install app (no docker) that will run the test suite against the E2E testing 
+# environment (in docker).
 cp .env.local .env || exit 1
 ./bin/install.sh || exit 1
 
+# TEST USING SQLITE
+echo "Running E2E tests using SQLite ..."
+
+# Start E2E testing environment
+./docker/bin/e2e/sqlite/e2e-env-up.sh || exit 1
+
+wait_for_container_to_be_healthy torrust-mysql-1 10 3
+# todo: implement healthchecks for tracker and backend and wait until they are healthy
+#wait_for_container torrust-tracker-1 10 3
+#wait_for_container torrust-idx-back-1 10 3
+sleep 20s
+
+# Just to make sure that everything is up and running
+docker ps
+
+# Run E2E tests with shared app instance
+TORRUST_IDX_BACK_E2E_SHARED=true TORRUST_IDX_BACK_E2E_CONFIG_PATH="./config-idx-back.sqlite.local.toml" cargo test || exit 1
+
+# Stop E2E testing environment
+docker compose down
+
+# TEST USING MYSQL
+echo "Running E2E tests using MySQL ..."
+
 # Start E2E testing environment
 ./docker/bin/e2e/mysql/e2e-env-up.sh || exit 1
 
@@ -67,4 +94,4 @@ mysql -h $MYSQL_HOST -u $MYSQL_USER -p$MYSQL_PASSWORD -e "CREATE DATABASE IF NOT
 TORRUST_IDX_BACK_E2E_SHARED=true TORRUST_IDX_BACK_E2E_CONFIG_PATH="./config-idx-back.mysql.local.toml" cargo test || exit 1
 
 # Stop E2E testing environment
-./docker/bin/e2e/mysql/e2e-env-down.sh
+docker compose down

docker/bin/e2e-env-reset.sh → docker/bin/e2e/sqlite/e2e-env-reset.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-# Delete the SQLite databases and recreate them.
+# Delete the databases and recreate them.
 
-./docker/bin/e2e-env-down.sh
+docker compose down
 
 rm -f ./storage/database/torrust_index_backend_e2e_testing.db
 rm -f ./storage/database/torrust_tracker_e2e_testing.db
@@ -23,4 +23,4 @@ if ! [ -f "./storage/database/torrust_tracker_e2e_testing.db" ]; then
     echo ";" | sqlite3 ./storage/database/torrust_tracker_e2e_testing.db
 fi
 
-./docker/bin/e2e-env-up.sh
+./docker/bin/e2e/sqlite/e2e-env-up.sh

docker/bin/e2e/sqlite/e2e-env-restart.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker compose down
+./docker/bin/e2e/sqlite/e2e-env-up.sh

docker/bin/e2e-env-up.sh → docker/bin/e2e/sqlite/e2e-env-up.sh

@@ -4,7 +4,7 @@ TORRUST_IDX_BACK_USER_UID=${TORRUST_IDX_BACK_USER_UID:-1000} \
     docker compose build
 
 TORRUST_IDX_BACK_USER_UID=${TORRUST_IDX_BACK_USER_UID:-1000} \
-    TORRUST_IDX_BACK_CONFIG=$(cat config-idx-back.local.toml) \
+    TORRUST_IDX_BACK_CONFIG=$(cat config-idx-back.sqlite.local.toml) \
     TORRUST_TRACKER_CONFIG=$(cat config-tracker.local.toml) \
     TORRUST_TRACKER_API_TOKEN=${TORRUST_TRACKER_API_TOKEN:-MyAccessToken} \
     docker compose up -d