Refactor executing the test.

- Port all improvement done in previous version
- allow to run test in parallele of update (using different .env file)

Author: sebastienbeau

src/.gitlab-ci.yml.jinja

@@ -303,55 +303,35 @@ lint:
   # can be run sooner
   needs: ["fetch"]
 
-
 test:
   stage: test
   script:
     - CURRENT_PATH=`pwd`
     - cd ~gitlab-runner/builds/${AK_WORKING_DIR}
-    # get list of modules to test
-    # add back --select-exclude ${EXCLUDE_MODULES:-none} from a path
-    # qu'est ce que ça fait ça ?
-    #- docker compose run odoo initdb ${DB_NAME} --cache-prefix ${CI_PROJECT_NAME:0:7}
-    # TODO: réflechir si on laisse ça ici ou dans le conteneur
-
-    # list of all local-src modules
-    - ADDONS_TEST=$(manifestoo --select-addons-dir odoo/local-src list --separator=,)
-    - ADDONS_TEST_DEP=$(manifestoo --select-addons-dir odoo/local-src list-depends --separator=,)
-    - echo $ADDONS_TEST
-    - echo $ADDONS_TEST_DEP
-    # start from a clean state
-    - docker compose --profile db run --rm bedrock dropdb --force --if-exists ${BUILD_NAME}_test
-    # --labels traefik.enable=false in order to not mess with the review
-    # init db with dependencies of our modules
-    # we force PG port in order to bypass pgbouncer
-    - docker compose run --labels traefik.enable=false -e DB_NAME="${BUILD_NAME}_test" -e PGDATABASE="${BUILD_NAME}_test" -e "PGPORT=5432" -e "DB_PORT=5432" --rm odoo click-odoo-initdb -n ${BUILD_NAME}_test -m ${ADDONS_TEST_DEP} --cache-prefix ${CI_PROJECT_NAME:0:7}
-    # run the tests here
-    - docker compose run --labels traefik.enable=false -e DB_NAME="${BUILD_NAME}_test" -e PGDATABASE="${BUILD_NAME}_test" --rm --workdir /data/odoo/filestore odoo coverage run --include "/odoo/local-src/*" --branch /odoo/bin/odoo --stop-after-init -i ${ADDONS_TEST} --test-enable --workers=0
-    # display report in MR
-    - docker compose run --labels traefik.enable=false -e DB_NAME="${BUILD_NAME}_test" -e PGDATABASE="${BUILD_NAME}_test" --rm --workdir /data/odoo/filestore odoo coverage report
-    # export for the artifacts
-    - docker compose run --labels traefik.enable=false -e DB_NAME="${BUILD_NAME}_test" -e PGDATABASE="${BUILD_NAME}_test" --rm --workdir /data/odoo/filestore odoo coverage xml --skip-empty
-    # extract coverage report
-    - docker compose cp odoo:/data/odoo/filestore/coverage.xml coverage.xml
-    # move coverage report to accessible location from gitlab-ci
-    - cp coverage.xml ${CURRENT_PATH}/coverage.xml
+    - cp .env .env-test
+    - echo "ENABLE_TRAEFIK=false" >> .env-test
+    - echo "COMPOSE_PROJECT_NAME=${BUILD_NAME}_test" >> .env-test
+    - echo "PGDATABASE=${BUILD_NAME}_test" >> .env-test
+    - docker compose --env-file .env-test kill
+    - dropdb --force --if-exists ${BUILD_NAME}_test
+    - docker compose --env-file .env-test run --rm odoo initdb ${BUILD_NAME}_test --cache-prefix ${CI_PROJECT_NAME:0:7}
+    - docker compose --env-file .env-test run --rm odoo runtests
+    - mv shared $CURRENT_PATH/
   rules:
     # Run tests in MR if there is no Skiptest tag
     - if: $AK_IS_MR == "true" && $CI_MERGE_REQUEST_LABELS !~ /Skiptest/
+    # Always run test in major branch
+    - if: $AK_IS_MAJOR_BRANCH == "true" && $AK_DO_OPENUPGRADE_MIGRATION != "true"
   needs:
-      # update_db do a docker compose stop, we don't want to be halted
-      # if this job start sooner
-      # optional true, let us the ability to run if update_db is cancelled
-    - job: "update_db"
-      optional: true
-  allow_failure: true
-  coverage: '/TOTAL(\W+\d+){5}\%/'
+    - job: "build"
+  coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
   artifacts:
+    when: always
     reports:
+      junit: shared/test_results/*.xml
       coverage_report:
         coverage_format: cobertura
-        path: coverage.xml
+        path: shared/coverage.xml
 
 # Run the container used for the review
 review:

src/ci.docker-compose.yml.jinja

@@ -40,7 +40,7 @@ services:
       PGPORT: 6432
 {% endif %}
     labels:
-      - "traefik.enable=true"
+      - "traefik.enable=${ENABLE_TRAEFIK:-true}"
       - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.rule=Host(`${DOMAIN}`)"
       - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.tls=false"
       - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-long.rule=Host(`${DOMAIN}`) && PathPrefix(`/longpolling/`)"

src/odoo/Dockerfile.jinja

@@ -22,6 +22,8 @@ COPY ./src/odoo/tools /odoo/src/odoo/tools
 COPY ./src/odoo/upgrade /odoo/src/odoo/upgrade
 RUN /odoo/bin/pip install -e /odoo/src
 
+COPY bin/* /usr/local/bin/
+
 FROM base as thisproject
 COPY ./requirements.txt /odoo/requirements.txt
 RUN /odoo/bin/pip install --no-cache-dir \

src/odoo/bin/initdb

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -euxo pipefail
+
+# Usage: initdb dbtest
+
+echo "Create database $1"
+
+EXTRA_ARGS="${@:2}"
+ADDONS_INIT=$(manifestoo --select-exclude ${EXCLUDE_MODULES:-none} --select-addons-dir /odoo/local-src list-depends --separator=,)
+
+# Some module like product_code_unique can break the installation if their are installed too early, so you can use the variable "EXCLUDE_DEPENDENCIES" to exclude them
+
+export ADDONS_INIT
+ADDONS_INIT=l10n_generic_coa,$(python3 -c "import os; print(','.join([x for x in os.environ.get('ADDONS_INIT').split(',') if x not in os.environ.get('EXCLUDE_DEPENDENCIES', '').split(',')]))")
+
+click-odoo-initdb -n $1 -m ${ADDONS_INIT} ${EXTRA_ARGS}

src/odoo/bin/runtests

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -euxo pipefail
+
+# Usage: runtest
+
+# Run tests. Use unbuffer to get a colored output.
+
+ADDONS_TEST=$(manifestoo --select-exclude ${EXCLUDE_MODULES:-none} --select-addons-dir /odoo/local-src list --separator=,)
+# Move to shared folder so coverage file will be shared with the host
+# and so accessible by the gitlab runner
+cd /odoo/shared
+unbuffer coverage run --include "/odoo/local-src/*" --branch $(which odoo) --stop-after-init -i ${ADDONS_TEST} --test-enable --workers=0
+ls -alh
+coverage report -i --precision=2 --skip-empty
+coverage xml -i -o coverage.xml
+
+sed -i "s=<source></source>=<source>/home/gitlab-runner/builds</source>=g" /odoo/shared/coverage.xml
+sed -i "s=/odoo/local-src=${CI_PROJECT_DIR}/odoo/local-src=g" /odoo/shared/coverage.xml
+sed -i "s=/home/gitlab-runner/builds/=builds/=g" /odoo/shared/coverage.xml

src/odoo/local-src/custom_all/__manifest__.py.jinja

@@ -16,6 +16,7 @@
         "auth_oidc_akretion_data",
         "auth_oidc_environment",
         "database_age_cron",
+        "odoo_test_xmlrunner",
         "server_environment_ir_config_parameter",
         "web_environment_ribbon",
     ],

src/odoo/requirements.txt

@@ -3,6 +3,7 @@ pyjwt # auth_oidc
 python-jose[cryptography] # auth_oidc
 #sentry 1.9.0 fixé dans le manifest du module sentry pour le moment
 sentry-sdk<=1.9.0
+unittest-xml-reporting # odoo_test_xmlrunner
 
 #apispec #shopinvader
 #boto3==1.20.32 # shopinvader

src/odoo/spec.yaml.jinja

@@ -25,6 +25,7 @@ server-tools:
     modules:
        - sentry
        - bus_alt_connection
+       - odoo_test_xmlrunner
     src: https://github.com/oca/server-tools {{ odoo_version }}
 
 web: