From 8d2b151a8553e47dc31c8972513afc576dd41ed2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Sainl=C3=A9ger?= Date: Mon, 2 Feb 2026 22:11:15 +0100 Subject: [PATCH] [IMP] update all script paths for new directory structure Update all path references to match the new directory layout: upgrade.sh: - ./prepare_db.sh -> ${SCRIPT_DIR}/scripts/prepare_db.sh - ./finalize_db.sh -> ${SCRIPT_DIR}/scripts/finalize_db.sh - ${SCRIPT_DIR}/${version}.0/ -> ${SCRIPT_DIR}/versions/${version}.0/ scripts/prepare_db.sh: - pre_migration_view_checking.py -> ${SCRIPT_DIR}/lib/python/check_views.py scripts/finalize_db.sh: - post_migration_fix_duplicated_views.py -> ${SCRIPT_DIR}/lib/python/fix_duplicated_views.py - post_migration_cleanup_obsolete_modules.py -> ${SCRIPT_DIR}/lib/python/cleanup_modules.py versions/*/upgrade.sh: - ../compose.yml -> ../../config/compose.yml --- scripts/finalize_db.sh | 9 +++++---- scripts/prepare_db.sh | 3 ++- upgrade.sh | 10 +++++----- versions/13.0/upgrade.sh | 2 +- versions/14.0/upgrade.sh | 2 +- versions/15.0/upgrade.sh | 2 +- versions/16.0/upgrade.sh | 2 +- versions/17.0/upgrade.sh | 2 +- versions/18.0/upgrade.sh | 2 +- 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/scripts/finalize_db.sh b/scripts/finalize_db.sh index 9f77349..af18bd3 100755 --- a/scripts/finalize_db.sh +++ b/scripts/finalize_db.sh @@ -34,14 +34,15 @@ EOF ) query_postgres_container "$CLEANUP_SQL" "$DB_NAME" -PYTHON_SCRIPT=post_migration_fix_duplicated_views.py +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" + +PYTHON_SCRIPT="${SCRIPT_DIR}/lib/python/fix_duplicated_views.py" echo "Remove duplicated views with script $PYTHON_SCRIPT ..." exec_python_script_in_odoo_shell "$DB_NAME" "$DB_NAME" "$PYTHON_SCRIPT" -# Uninstall obsolete add-ons -PYTHON_SCRIPT=post_migration_cleanup_obsolete_modules.py +PYTHON_SCRIPT="${SCRIPT_DIR}/lib/python/cleanup_modules.py" echo "Uninstall obsolete add-ons with script $PYTHON_SCRIPT ..." -exec_python_script_in_odoo_shell "$DB_NAME" "$DB_NAME" "$PYTHON_SCRIPT" || exit 1 +exec_python_script_in_odoo_shell "$DB_NAME" "$DB_NAME" "$PYTHON_SCRIPT" # Give back the right to user to access to the tables # docker exec -u 70 "$DB_CONTAINER_NAME" pgm chown "$FINALE_SERVICE_NAME" "$DB_NAME" diff --git a/scripts/prepare_db.sh b/scripts/prepare_db.sh index 2ae01c0..775cbaf 100755 --- a/scripts/prepare_db.sh +++ b/scripts/prepare_db.sh @@ -64,7 +64,8 @@ echo "Installed add-ons not available in final Odoo version:" echo "$missing_addons" confirm_or_exit "Do you accept to migrate with these add-ons still installed?" -PYTHON_SCRIPT=pre_migration_view_checking.py +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" +PYTHON_SCRIPT="${SCRIPT_DIR}/lib/python/check_views.py" echo "Check views with script $PYTHON_SCRIPT ..." exec_python_script_in_odoo_shell "$DB_NAME" "$DB_NAME" "$PYTHON_SCRIPT" diff --git a/upgrade.sh b/upgrade.sh index 69dd260..df35c3b 100755 --- a/upgrade.sh +++ b/upgrade.sh @@ -117,7 +117,7 @@ log_info "Migration path is ${versions[*]}" log_step "DATABASE PREPARATION" -./prepare_db.sh "$COPY_DB_NAME" "$COPY_DB_NAME" "$FINALE_DB_NAME" "$FINALE_SERVICE_NAME" +"${SCRIPT_DIR}/scripts/prepare_db.sh" "$COPY_DB_NAME" "$COPY_DB_NAME" "$FINALE_DB_NAME" "$FINALE_SERVICE_NAME" log_step "UPGRADE PROCESS" @@ -125,15 +125,15 @@ log_step "UPGRADE PROCESS" for version in "${versions[@]}"; do log_info "START UPGRADE TO ${version}.0" - "${SCRIPT_DIR}/${version}.0/pre_upgrade.sh" - "${SCRIPT_DIR}/${version}.0/upgrade.sh" - "${SCRIPT_DIR}/${version}.0/post_upgrade.sh" + "${SCRIPT_DIR}/versions/${version}.0/pre_upgrade.sh" + "${SCRIPT_DIR}/versions/${version}.0/upgrade.sh" + "${SCRIPT_DIR}/versions/${version}.0/post_upgrade.sh" log_info "END UPGRADE TO ${version}.0" done log_step "POST-UPGRADE PROCESSES" -./finalize_db.sh "$FINALE_DB_NAME" "$FINALE_SERVICE_NAME" +"${SCRIPT_DIR}/scripts/finalize_db.sh" "$FINALE_DB_NAME" "$FINALE_SERVICE_NAME" log_step "UPGRADE PROCESS ENDED WITH SUCCESS" diff --git a/versions/13.0/upgrade.sh b/versions/13.0/upgrade.sh index ce600e3..07ac661 100755 --- a/versions/13.0/upgrade.sh +++ b/versions/13.0/upgrade.sh @@ -1,4 +1,4 @@ #!/bin/bash set -euo pipefail -compose -f ../compose.yml run -p 8013:8069 ou13 --config=/opt/odoo/auto/odoo.conf --stop-after-init -u all --workers 0 --log-level=debug --max-cron-threads=0 --limit-time-real=10000 --database=ou13 +compose -f ../../config/compose.yml run -p 8013:8069 ou13 --config=/opt/odoo/auto/odoo.conf --stop-after-init -u all --workers 0 --log-level=debug --max-cron-threads=0 --limit-time-real=10000 --database=ou13 diff --git a/versions/14.0/upgrade.sh b/versions/14.0/upgrade.sh index f042740..0dde9e9 100755 --- a/versions/14.0/upgrade.sh +++ b/versions/14.0/upgrade.sh @@ -1,4 +1,4 @@ #!/bin/bash set -euo pipefail -compose -f ../compose.yml run -p 8014:8069 ou14 --config=/opt/odoo/auto/odoo.conf --stop-after-init -u all --workers 0 --log-level=debug --max-cron-threads=0 --limit-time-real=10000 --database=ou14 --load=base,web,openupgrade_framework +compose -f ../../config/compose.yml run -p 8014:8069 ou14 --config=/opt/odoo/auto/odoo.conf --stop-after-init -u all --workers 0 --log-level=debug --max-cron-threads=0 --limit-time-real=10000 --database=ou14 --load=base,web,openupgrade_framework diff --git a/versions/15.0/upgrade.sh b/versions/15.0/upgrade.sh index 5f78481..67989aa 100755 --- a/versions/15.0/upgrade.sh +++ b/versions/15.0/upgrade.sh @@ -1,4 +1,4 @@ #!/bin/bash set -euo pipefail -compose -f ../compose.yml run -p 8015:8069 ou15 --config=/opt/odoo/auto/odoo.conf --stop-after-init -u all --workers 0 --log-level=debug --max-cron-threads=0 --limit-time-real=10000 --database=ou15 --load=base,web,openupgrade_framework +compose -f ../../config/compose.yml run -p 8015:8069 ou15 --config=/opt/odoo/auto/odoo.conf --stop-after-init -u all --workers 0 --log-level=debug --max-cron-threads=0 --limit-time-real=10000 --database=ou15 --load=base,web,openupgrade_framework diff --git a/versions/16.0/upgrade.sh b/versions/16.0/upgrade.sh index 28087e1..461b5d4 100755 --- a/versions/16.0/upgrade.sh +++ b/versions/16.0/upgrade.sh @@ -1,4 +1,4 @@ #!/bin/bash set -euo pipefail -compose -f ../compose.yml run -p 8016:8069 ou16 --config=/opt/odoo/auto/odoo.conf --stop-after-init -u all --workers 0 --log-level=debug --max-cron-threads=0 --limit-time-real=10000 --database=ou16 --load=base,web,openupgrade_framework +compose -f ../../config/compose.yml run -p 8016:8069 ou16 --config=/opt/odoo/auto/odoo.conf --stop-after-init -u all --workers 0 --log-level=debug --max-cron-threads=0 --limit-time-real=10000 --database=ou16 --load=base,web,openupgrade_framework diff --git a/versions/17.0/upgrade.sh b/versions/17.0/upgrade.sh index 8a73231..e180ead 100755 --- a/versions/17.0/upgrade.sh +++ b/versions/17.0/upgrade.sh @@ -1,4 +1,4 @@ #!/bin/bash set -euo pipefail -compose -f ../compose.yml run -p 8017:8069 ou17 --config=/opt/odoo/auto/odoo.conf --stop-after-init -u all --workers 0 --log-level=debug --max-cron-threads=0 --limit-time-real=10000 --database=ou17 --load=base,web,openupgrade_framework +compose -f ../../config/compose.yml run -p 8017:8069 ou17 --config=/opt/odoo/auto/odoo.conf --stop-after-init -u all --workers 0 --log-level=debug --max-cron-threads=0 --limit-time-real=10000 --database=ou17 --load=base,web,openupgrade_framework diff --git a/versions/18.0/upgrade.sh b/versions/18.0/upgrade.sh index 53da2ff..9153349 100755 --- a/versions/18.0/upgrade.sh +++ b/versions/18.0/upgrade.sh @@ -1,4 +1,4 @@ #!/bin/bash set -euo pipefail -compose -f ../compose.yml run -p 8018:8069 ou18 --config=/opt/odoo/auto/odoo.conf --stop-after-init -u all --workers 0 --log-level=debug --max-cron-threads=0 --limit-time-real=10000 --database=ou18 --load=base,web,openupgrade_framework +compose -f ../../config/compose.yml run -p 8018:8069 ou18 --config=/opt/odoo/auto/odoo.conf --stop-after-init -u all --workers 0 --log-level=debug --max-cron-threads=0 --limit-time-real=10000 --database=ou18 --load=base,web,openupgrade_framework