Skip to content
Snippets Groups Projects
Commit 6389460728ab authored by Vincent Hatakeyama's avatar Vincent Hatakeyama
Browse files

:rocket: fix CI

parent c34c202465e3
No related branches found
No related tags found
1 merge request!194🚀 fix CI
...@@ -85,7 +85,9 @@ ...@@ -85,7 +85,9 @@
import_jsonrpc_odoo11_test-focal: import_jsonrpc_odoo11_test-focal:
stage: test stage: test
needs: [] needs:
- job: create_package
artifacts: true
image: image:
name: quay.orus.io/odoo/odoo:11.0-focal name: quay.orus.io/odoo/odoo:11.0-focal
entrypoint: [""] entrypoint: [""]
...@@ -98,8 +100,9 @@ ...@@ -98,8 +100,9 @@
POSTGRES_HOST_AUTH_METHOD: trust POSTGRES_HOST_AUTH_METHOD: trust
ODOO_ADDONS_PATH: "" ODOO_ADDONS_PATH: ""
ODOO_TYPE: odoo11 ODOO_TYPE: odoo11
ODOO_DATA_DIR: /var/lib/odoo
before_script: before_script:
- python3 -m pip show pip setuptools - python3 -m pip show pip setuptools
- python3 -m pip install pip>10 - python3 -m pip install pip>10
# install modules # install modules
- &install_modules $CI_PROJECT_DIR/start --db_host=db -d test_setup - &install_modules $CI_PROJECT_DIR/start --db_host=db -d test_setup
...@@ -101,8 +104,8 @@ ...@@ -101,8 +104,8 @@
before_script: before_script:
- python3 -m pip show pip setuptools - python3 -m pip show pip setuptools
- python3 -m pip install pip>10 - python3 -m pip install pip>10
# install modules # install modules
- &install_modules $CI_PROJECT_DIR/start --db_host=db -d test_setup - &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 --stop-after-init
# install current version as this is the one tested, not the one in the image # install current version as this is the one tested, not the one in the image
...@@ -107,7 +110,7 @@ ...@@ -107,7 +110,7 @@
--stop-after-init --stop-after-init
# install current version as this is the one tested, not the one in the image # 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 - export PATH=$HOME/.local/bin:$PATH
$CI_PROJECT_DIR - python3 -m pip install dist/*.whl
script: script:
# restart odoo with installed modules and use it in background # 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 - $CI_PROJECT_DIR/start --db_host=db -d test_setup --max-cron-threads=0 --data-dir
...@@ -111,7 +114,7 @@ ...@@ -111,7 +114,7 @@
script: script:
# restart odoo with installed modules and use it in background # 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 - $CI_PROJECT_DIR/start --db_host=db -d test_setup --max-cron-threads=0 --data-dir
/var/lib/odoo & $ODOO_DATA_DIR &
- sleep 3 - sleep 3
# then test the setup files # then test the setup files
- import_jsonrpc -v --host localhost --password admin -d test_setup --protocol - import_jsonrpc -v --host localhost --password admin -d test_setup --protocol
...@@ -130,8 +133,5 @@ ...@@ -130,8 +133,5 @@
import_jsonrpc_odoo11_test: import_jsonrpc_odoo11_test:
extends: import_jsonrpc_odoo11_test-focal extends: import_jsonrpc_odoo11_test-focal
needs:
- job: create_package
artifacts: true
image: image:
name: quay.orus.io/odoo/odoo:11.0-bionic name: quay.orus.io/odoo/odoo:11.0-bionic
...@@ -136,9 +136,5 @@ ...@@ -136,9 +136,5 @@
image: image:
name: quay.orus.io/odoo/odoo:11.0-bionic 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: import_base_import_odoo11_test:
extends: import_jsonrpc_odoo11_test extends: import_jsonrpc_odoo11_test
...@@ -179,5 +175,6 @@ ...@@ -179,5 +175,6 @@
entrypoint: [""] entrypoint: [""]
variables: variables:
ODOO_TYPE: odoo15 ODOO_TYPE: odoo15
ODOO_DATA_DIR: /var/opt/odoo
import_jsonrpc_odoo16_test: import_jsonrpc_odoo16_test:
...@@ -182,6 +179,6 @@ ...@@ -182,6 +179,6 @@
import_jsonrpc_odoo16_test: import_jsonrpc_odoo16_test:
extends: import_jsonrpc_odoo11_test-focal extends: import_jsonrpc_odoo15_test
image: image:
name: quay.orus.io/odoo/odoo:16.0 name: quay.orus.io/odoo/odoo:16.0
entrypoint: [""] entrypoint: [""]
...@@ -185,6 +182,10 @@ ...@@ -185,6 +182,10 @@
image: image:
name: quay.orus.io/odoo/odoo:16.0 name: quay.orus.io/odoo/odoo:16.0
entrypoint: [""] entrypoint: [""]
services:
- name: postgres:15-alpine
command: ["-c", "fsync=off"]
alias: db
variables: variables:
ODOO_TYPE: odoo16 ODOO_TYPE: odoo16
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment