add more tests, and including some on odoo 13

.gitlab-ci.yml

@@ -23,10 +23,10 @@
     name: registry.xcg.io/odoo/odoo:11.0-bionic
     entrypoint: [""]
   services:
-  - name: postgres:11-alpine
+  - name: postgres:12-alpine
     command: ["-c", "fsync=off"]
     alias: db
   variables:
     POSTGRES_USER: odoo
     POSTGRES_HOST_AUTH_METHOD: trust
     ODOO_ADDONS_PATH: ""
@@ -27,9 +27,10 @@
     command: ["-c", "fsync=off"]
     alias: db
   variables:
     POSTGRES_USER: odoo
     POSTGRES_HOST_AUTH_METHOD: trust
     ODOO_ADDONS_PATH: ""
+    ODOO_TYPE: odoo11
   before_script:
   - pip3 install $CI_PROJECT_DIR --disable-pip-version-check --no-cache-dir
   script:
@@ -33,7 +34,7 @@
   before_script:
   - pip3 install $CI_PROJECT_DIR --disable-pip-version-check --no-cache-dir
   script:
-  - sudo -u odoo env ODOO_TYPE=odoo11 $CI_PROJECT_DIR/start --db_host=db -d test_setup --max-cron-threads=0 --without-demo=all --data-dir /var/lib/odoo --init base &
+  - sudo --preserve-env -u odoo $CI_PROJECT_DIR/start --db_host=db -d test_setup --max-cron-threads=0 --without-demo=all --data-dir /var/lib/odoo --init base &
   # wait for odoo to install the modules
   - sleep 35
   # then test the setup files
@@ -42,6 +43,32 @@
   - import_jsonrpc -v --host localhost --password admin -d test_setup --protocol jsonrpc -p 8069 --directory tests/import_emptyyaml --delimiter ";"
   - import_sql -vv --host postgres --user odoo --database test_setup --directory tests/import_sql
 
+import_base_import_odoo11_test:
+  extends: import_jsonrpc_odoo11_test
+  script:
+  - sudo --preserve-env -u odoo $CI_PROJECT_DIR/start --db_host=db -d test_setup --max-cron-threads=0 --without-demo=all --data-dir /var/lib/odoo --init base &
+  # wait for odoo to install the modules
+  - sleep 35
+  # then test the setup files
+  - import_base_import -v --host localhost --password admin -d test_setup --protocol jsonrpc -p 8069 --directory tests/import
+  - import_sql -vv --host postgres --user odoo --database test_setup --directory tests/import_sql
+
+import_jsonrpc_odoo13_test:
+  extends: import_jsonrpc_odoo11_test
+  image:
+    name: registry.xcg.io/odoo/odoo:13.0
+    entrypoint: [""]
+  variables:
+    ODOO_TYPE: odoo13
+
+import_base_import_odoo13_test:
+  extends: import_base_import_odoo11_test
+  image:
+    name: registry.xcg.io/odoo/odoo:13.0
+    entrypoint: [""]
+  variables:
+    ODOO_TYPE: odoo13
+
 build-documentation:
   stage: build
   image: python:3-alpine