From 36490f83ea96466367d3c2fca2714ad7903386ec Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Thu, 5 Jan 2023 08:22:40 -0500 Subject: [PATCH 1/8] [UPD] manifest: use revision 12.0 instead of dev for cg --- manifest/default.dev.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest/default.dev.xml b/manifest/default.dev.xml index 18643a0..765680d 100644 --- a/manifest/default.dev.xml +++ b/manifest/default.dev.xml @@ -100,8 +100,8 @@ - - + + From 5ba826823f5c9d361201def206491aa777291410 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Thu, 5 Jan 2023 09:05:51 -0500 Subject: [PATCH 2/8] [FIX] makefile test_full_fast: generate a database test - because test is in parallel, cannot have enought time to create _cache_erplibre_base , so create it in serial before --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index adae43b..fe6963d 100644 --- a/Makefile +++ b/Makefile @@ -589,6 +589,8 @@ test_full: .PHONY: test_full_fast test_full_fast: ./script/make.sh clean + # Need to create a BD to create cache _cache_erplibre_base + ./script/database/db_restore.py --database test ./script/test/run_parallel_test.py # TODO This test is broken in parallel ./script/make.sh test_code_generator_hello_world @@ -596,6 +598,8 @@ test_full_fast: .PHONY: test_full_fast_coverage test_full_fast_coverage: ./script/make.sh clean + # Need to create a BD to create cache _cache_erplibre_base + ./script/database/db_restore.py --database test ./.venv/bin/coverage erase ./script/test/run_parallel_test.py --coverage # TODO This test is broken in parallel From 87367d647eb97612e2ee025d7406589f036e300a Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Fri, 6 Jan 2023 16:55:27 -0500 Subject: [PATCH 3/8] [FIX] check_addons_exist: remove blank addons_path --- script/addons/check_addons_exist.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/addons/check_addons_exist.py b/script/addons/check_addons_exist.py index f3d7d48..f5473f3 100755 --- a/script/addons/check_addons_exist.py +++ b/script/addons/check_addons_exist.py @@ -67,8 +67,8 @@ def main(): _logger.error(f"Missing section 'options' in '{config.config}'") return -1 - lst_addons_path = addons_path.split(",") - lst_module = config.module.split(",") + lst_addons_path = addons_path.strip(",").split(",") + lst_module = config.module.strip(",").split(",") dct_module_exist = defaultdict(list) dct_module_exist_empty = defaultdict(list) From c942fa783ff710a2f9439e90ecefd195d67d3457 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Fri, 6 Jan 2023 23:57:19 -0500 Subject: [PATCH 4/8] [FIX] run_parallel_cg_template: install module with template - add test cg_cg --- conf/list_cg_template_test.txt | 14 ++++++++------ conf/list_cg_test.txt | 2 +- .../install_addons_cg_template_restore_dev.sh | 6 ++++++ 3 files changed, 15 insertions(+), 7 deletions(-) create mode 100755 script/addons/install_addons_cg_template_restore_dev.sh diff --git a/conf/list_cg_template_test.txt b/conf/list_cg_template_test.txt index d1e804a..4bf8e7d 100644 --- a/conf/list_cg_template_test.txt +++ b/conf/list_cg_template_test.txt @@ -1,6 +1,8 @@ -./script/addons/install_addons_restore_dev.sh code_generator_template_demo_internal -./script/addons/install_addons_restore_dev.sh code_generator_template_demo_internal_inherit -./script/addons/install_addons_restore_dev.sh code_generator_template_demo_mariadb_sql_example_1 -./script/addons/install_addons_restore_dev.sh code_generator_template_demo_portal -./script/addons/install_addons_restore_dev.sh code_generator_template_demo_sysadmin_cron -./script/addons/install_addons_restore_dev.sh code_generator_template_demo_website_snippet \ No newline at end of file +./script/addons/install_addons_cg_template_restore_dev.sh code_generator code_generator_template_code_generator +./script/addons/install_addons_cg_template_restore_dev.sh demo_internal code_generator_template_demo_internal +./script/addons/install_addons_cg_template_restore_dev.sh demo_internal_inherit code_generator_template_demo_internal_inherit +./script/addons/install_addons_cg_template_restore_dev.sh demo_mariadb_sql_example_1 code_generator_template_demo_mariadb_sql_example_1 +./script/addons/install_addons_cg_template_restore_dev.sh demo_portal code_generator_template_demo_portal +./script/addons/install_addons_cg_template_restore_dev.sh auto_backup code_generator_template_demo_sysadmin_cron +./script/addons/install_addons_cg_template_restore_dev.sh demo_website_multiple_snippet code_generator_template_demo_website_multiple_snippet +./script/addons/install_addons_cg_template_restore_dev.sh demo_website_snippet code_generator_template_demo_website_snippet diff --git a/conf/list_cg_test.txt b/conf/list_cg_test.txt index 66a7c24..da6a885 100644 --- a/conf/list_cg_test.txt +++ b/conf/list_cg_test.txt @@ -1,4 +1,4 @@ -./script/addons/install_addons_restore_dev.sh code_generator_template_code_generator +./script/addons/install_addons_restore_dev.sh code_generator_code_generator ./script/addons/install_addons_restore_dev.sh code_generator_auto_backup ./script/addons/install_addons_restore_dev.sh code_generator_demo ./script/addons/install_addons_restore_dev.sh code_generator_demo_export_helpdesk diff --git a/script/addons/install_addons_cg_template_restore_dev.sh b/script/addons/install_addons_cg_template_restore_dev.sh new file mode 100755 index 0000000..9cd43bd --- /dev/null +++ b/script/addons/install_addons_cg_template_restore_dev.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +# "$1" module_name +# "$1" code_generator_template_name +./script/database/db_restore.py --database "$2" +./script/addons/install_addons_dev.sh "$2" "$1" +./script/addons/install_addons_dev.sh "$2" "$2" From cc438c8851226ff0cbc5b3f2a3cad8b92a772e9c Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sat, 7 Jan 2023 00:06:41 -0500 Subject: [PATCH 5/8] [FIX] script addons: check all return result - this will give error when execute in parallel --- .../addons/coverage_install_addons_restore_dev.sh | 9 +++++++++ .../install_addons_cg_template_restore_dev.sh | 15 +++++++++++++++ script/addons/install_addons_from_file.sh | 6 +++++- script/addons/install_addons_restore_dev.sh | 9 +++++++++ 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/script/addons/coverage_install_addons_restore_dev.sh b/script/addons/coverage_install_addons_restore_dev.sh index b33fa4b..8651a73 100755 --- a/script/addons/coverage_install_addons_restore_dev.sh +++ b/script/addons/coverage_install_addons_restore_dev.sh @@ -1,4 +1,13 @@ #!/usr/bin/env bash # "$1" code_generator_name ./script/database/db_restore.py --database "$1" +if [[ $retVal -ne 0 ]]; then + echo "Error ./script/database/db_restore.py into coverage_install_addons_restore_dev.sh" + exit 1 +fi + ./script/addons/coverage_install_addons_dev.sh "$1" "$1" +if [[ $retVal -ne 0 ]]; then + echo "Error ./script/addons/coverage_install_addons_dev.sh into coverage_install_addons_restore_dev.sh" + exit 1 +fi diff --git a/script/addons/install_addons_cg_template_restore_dev.sh b/script/addons/install_addons_cg_template_restore_dev.sh index 9cd43bd..fc614ec 100755 --- a/script/addons/install_addons_cg_template_restore_dev.sh +++ b/script/addons/install_addons_cg_template_restore_dev.sh @@ -2,5 +2,20 @@ # "$1" module_name # "$1" code_generator_template_name ./script/database/db_restore.py --database "$2" +retVal=$? +if [[ $retVal -ne 0 ]]; then + echo "Error ./script/database/db_restore.py into install_addons_cg_template_restore_dev.sh" + exit 1 +fi ./script/addons/install_addons_dev.sh "$2" "$1" +retVal=$? +if [[ $retVal -ne 0 ]]; then + echo "Error ./script/addons/install_addons_dev.sh install module into install_addons_cg_template_restore_dev.sh" + exit 1 +fi ./script/addons/install_addons_dev.sh "$2" "$2" +retVal=$? +if [[ $retVal -ne 0 ]]; then + echo "Error ./script/addons/install_addons_dev.sh install template into install_addons_cg_template_restore_dev.sh" + exit 1 +fi diff --git a/script/addons/install_addons_from_file.sh b/script/addons/install_addons_from_file.sh index 108c176..32cfa45 100755 --- a/script/addons/install_addons_from_file.sh +++ b/script/addons/install_addons_from_file.sh @@ -1,4 +1,8 @@ #!/usr/bin/env bash # $1 BD NAME # $2 file_path -./script/addons/install_addons.sh "$1" "$(<$2)" \ No newline at end of file +./script/addons/install_addons.sh "$1" "$(<$2)" +if [[ $retVal -ne 0 ]]; then + echo "Error ./script/addons/install_addons.sh into install_addons_from_file.sh" + exit 1 +fi diff --git a/script/addons/install_addons_restore_dev.sh b/script/addons/install_addons_restore_dev.sh index f5e2115..ddf4e46 100755 --- a/script/addons/install_addons_restore_dev.sh +++ b/script/addons/install_addons_restore_dev.sh @@ -1,4 +1,13 @@ #!/usr/bin/env bash # "$1" code_generator_name ./script/database/db_restore.py --database "$1" +if [[ $retVal -ne 0 ]]; then + echo "Error ./script/database/db_restore.py into install_addons_restore_dev.sh" + exit 1 +fi + ./script/addons/install_addons_dev.sh "$1" "$1" +if [[ $retVal -ne 0 ]]; then + echo "Error ./script/addons/install_addons_dev.sh into install_addons_restore_dev.sh" + exit 1 +fi From 14f81560452c2d1f83eb01ba6cfa431fe518fd07 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sat, 7 Jan 2023 00:14:47 -0500 Subject: [PATCH 6/8] [ADD] run_parallel_cg_migrator: remove migrator from cg run parallel --- Makefile | 4 ++++ conf/list_cg_migrator_test.txt | 1 + conf/list_cg_test.txt | 1 - 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 conf/list_cg_migrator_test.txt diff --git a/Makefile b/Makefile index fe6963d..5fbb99a 100644 --- a/Makefile +++ b/Makefile @@ -63,6 +63,10 @@ run_parallel_cg: run_parallel_cg_template: parallel < ./conf/list_cg_template_test.txt +.PHONY: run_parallel_cg_migrator +run_parallel_cg_migrator: + parallel < ./conf/list_cg_migrator_test.txt + ############# # INSTALL # ############# diff --git a/conf/list_cg_migrator_test.txt b/conf/list_cg_migrator_test.txt new file mode 100644 index 0000000..719c6e2 --- /dev/null +++ b/conf/list_cg_migrator_test.txt @@ -0,0 +1 @@ +./script/addons/install_addons_restore_dev.sh code_generator_migrator_demo_mariadb_sql_example_1 diff --git a/conf/list_cg_test.txt b/conf/list_cg_test.txt index da6a885..971e049 100644 --- a/conf/list_cg_test.txt +++ b/conf/list_cg_test.txt @@ -12,4 +12,3 @@ ./script/addons/install_addons_restore_dev.sh code_generator_demo_website_leaflet ./script/addons/install_addons_restore_dev.sh code_generator_demo_website_multiple_snippet ./script/addons/install_addons_restore_dev.sh code_generator_demo_website_snippet -./script/addons/install_addons_restore_dev.sh code_generator_migrator_demo_mariadb_sql_example_1 \ No newline at end of file From 7ca08b52eb635f1093b98081f367864d286a46a0 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sat, 7 Jan 2023 00:30:46 -0500 Subject: [PATCH 7/8] [FIX] script: add missing check variable --- script/addons/coverage_install_addons_restore_dev.sh | 2 ++ script/addons/install_addons_from_file.sh | 1 + script/addons/install_addons_restore_dev.sh | 2 ++ script/install/install_locally_dev.sh | 3 ++- script/install/install_locally_prod.sh | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/script/addons/coverage_install_addons_restore_dev.sh b/script/addons/coverage_install_addons_restore_dev.sh index 8651a73..93cfb31 100755 --- a/script/addons/coverage_install_addons_restore_dev.sh +++ b/script/addons/coverage_install_addons_restore_dev.sh @@ -1,12 +1,14 @@ #!/usr/bin/env bash # "$1" code_generator_name ./script/database/db_restore.py --database "$1" +retVal=$? if [[ $retVal -ne 0 ]]; then echo "Error ./script/database/db_restore.py into coverage_install_addons_restore_dev.sh" exit 1 fi ./script/addons/coverage_install_addons_dev.sh "$1" "$1" +retVal=$? if [[ $retVal -ne 0 ]]; then echo "Error ./script/addons/coverage_install_addons_dev.sh into coverage_install_addons_restore_dev.sh" exit 1 diff --git a/script/addons/install_addons_from_file.sh b/script/addons/install_addons_from_file.sh index 32cfa45..6c347e4 100755 --- a/script/addons/install_addons_from_file.sh +++ b/script/addons/install_addons_from_file.sh @@ -2,6 +2,7 @@ # $1 BD NAME # $2 file_path ./script/addons/install_addons.sh "$1" "$(<$2)" +retVal=$? if [[ $retVal -ne 0 ]]; then echo "Error ./script/addons/install_addons.sh into install_addons_from_file.sh" exit 1 diff --git a/script/addons/install_addons_restore_dev.sh b/script/addons/install_addons_restore_dev.sh index ddf4e46..1d51b44 100755 --- a/script/addons/install_addons_restore_dev.sh +++ b/script/addons/install_addons_restore_dev.sh @@ -1,12 +1,14 @@ #!/usr/bin/env bash # "$1" code_generator_name ./script/database/db_restore.py --database "$1" +retVal=$? if [[ $retVal -ne 0 ]]; then echo "Error ./script/database/db_restore.py into install_addons_restore_dev.sh" exit 1 fi ./script/addons/install_addons_dev.sh "$1" "$1" +retVal=$? if [[ $retVal -ne 0 ]]; then echo "Error ./script/addons/install_addons_dev.sh into install_addons_restore_dev.sh" exit 1 diff --git a/script/install/install_locally_dev.sh b/script/install/install_locally_dev.sh index 2f4cc91..bfe9f12 100755 --- a/script/install/install_locally_dev.sh +++ b/script/install/install_locally_dev.sh @@ -11,13 +11,14 @@ fi # Update git-repo ./script/manifest/update_manifest_local_dev.sh +retVal=$? if [[ $retVal -ne 0 ]]; then echo "Error manifest update, check git-repo." exit 1 fi # Install maintainer-tools -cd script/OCA_maintainer-tools +cd script/OCA_maintainer-tools || exit # virtualenv is not installed by default #virtualenv env ../../.venv/bin/python -m venv env diff --git a/script/install/install_locally_prod.sh b/script/install/install_locally_prod.sh index d220a77..2d23e59 100755 --- a/script/install/install_locally_prod.sh +++ b/script/install/install_locally_prod.sh @@ -11,6 +11,7 @@ fi # Update git-repo ./script/manifest/update_manifest_prod.sh +retVal=$? if [[ $retVal -ne 0 ]]; then echo "Error manifest update, check git-repo." exit 1 From b934315962014825a9fbfb26dd19611d1dacdeee Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sat, 7 Jan 2023 02:00:19 -0500 Subject: [PATCH 8/8] [ADD] makefile: comment debug command to run_parallel_test.py --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 5fbb99a..ba74a55 100644 --- a/Makefile +++ b/Makefile @@ -595,6 +595,7 @@ test_full_fast: ./script/make.sh clean # Need to create a BD to create cache _cache_erplibre_base ./script/database/db_restore.py --database test + #./script/test/run_parallel_test.py --keep_cache ./script/test/run_parallel_test.py # TODO This test is broken in parallel ./script/make.sh test_code_generator_hello_world