fix CI

.gitlab-ci.yml

@@ -85,7 +85,9 @@
 
 import_jsonrpc_odoo11_test-focal:
   stage: test
-  needs: []
+  needs:
+    - job: create_package
+      artifacts: true
   image:
     name: quay.orus.io/odoo/odoo:11.0-focal
     entrypoint: [""]
@@ -98,8 +100,9 @@
     POSTGRES_HOST_AUTH_METHOD: trust
     ODOO_ADDONS_PATH: ""
     ODOO_TYPE: odoo11
+    ODOO_DATA_DIR: /var/lib/odoo
   before_script:
     - python3 -m pip show pip setuptools
     - python3 -m pip install pip>10
     # install modules
     - &install_modules $CI_PROJECT_DIR/start --db_host=db -d test_setup
@@ -101,8 +104,8 @@
   before_script:
     - python3 -m pip show pip setuptools
     - python3 -m pip install pip>10
     # install modules
     - &install_modules $CI_PROJECT_DIR/start --db_host=db -d test_setup
-      --max-cron-threads=0 --without-demo=all --data-dir /var/lib/odoo --init base
+      --max-cron-threads=0 --without-demo=all --data-dir $ODOO_DATA_DIR --init base
       --stop-after-init
     # install current version as this is the one tested, not the one in the image
@@ -107,7 +110,7 @@
       --stop-after-init
     # install current version as this is the one tested, not the one in the image
-    - python3 -m pip install --disable-pip-version-check --no-cache-dir --upgrade
-      $CI_PROJECT_DIR
+    - export PATH=$HOME/.local/bin:$PATH
+    - python3 -m pip install dist/*.whl
   script:
     # restart odoo with installed modules and use it in background
     - $CI_PROJECT_DIR/start --db_host=db -d test_setup --max-cron-threads=0 --data-dir
@@ -111,7 +114,7 @@
   script:
     # restart odoo with installed modules and use it in background
     - $CI_PROJECT_DIR/start --db_host=db -d test_setup --max-cron-threads=0 --data-dir
-      /var/lib/odoo &
+      $ODOO_DATA_DIR &
     - sleep 3
     # then test the setup files
     - import_jsonrpc -v --host localhost --password admin -d test_setup --protocol
@@ -130,8 +133,5 @@
 
 import_jsonrpc_odoo11_test:
   extends: import_jsonrpc_odoo11_test-focal
-  needs:
-    - job: create_package
-      artifacts: true
   image:
     name: quay.orus.io/odoo/odoo:11.0-bionic
@@ -136,9 +136,5 @@
   image:
     name: quay.orus.io/odoo/odoo:11.0-bionic
-  before_script:
-    - export PATH=$HOME/.local/bin:$PATH
-    - python3 -m pip install dist/*.whl
-    - *install_modules
 
 import_base_import_odoo11_test:
   extends: import_jsonrpc_odoo11_test
@@ -179,5 +175,6 @@
     entrypoint: [""]
   variables:
     ODOO_TYPE: odoo15
+    ODOO_DATA_DIR: /var/opt/odoo
 
 import_jsonrpc_odoo16_test:
@@ -182,6 +179,6 @@
 
 import_jsonrpc_odoo16_test:
-  extends: import_jsonrpc_odoo11_test-focal
+  extends: import_jsonrpc_odoo15_test
   image:
     name: quay.orus.io/odoo/odoo:16.0
     entrypoint: [""]
@@ -185,6 +182,10 @@
   image:
     name: quay.orus.io/odoo/odoo:16.0
     entrypoint: [""]
+  services:
+    - name: postgres:15-alpine
+      command: ["-c", "fsync=off"]
+      alias: db
   variables:
     ODOO_TYPE: odoo16