Skip to content

Commit

Permalink
TA#66731 [ADD][16.0] Initiate branch
Browse files Browse the repository at this point in the history
  • Loading branch information
majouda committed Jun 25, 2024
1 parent 9a86b86 commit 5bd5871
Show file tree
Hide file tree
Showing 196 changed files with 63 additions and 4,152 deletions.
65 changes: 37 additions & 28 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
version: 2.0

quay_io_login: &quay_io_login
name: Login to Quay.io register
command: docker login quay.io -u "${QUAY_USER}" -p "${QUAY_TOKEN}"

jobs:
tests:
machine: true
steps:
- checkout

- run:
<<: *quay_io_login

- run:
name: Build -- Init Database
command: docker-compose run --rm odoo odoo --stop-after-init -i main
Expand All @@ -12,43 +21,43 @@ jobs:
name: Setup Log Folder For Reports
command: sudo mkdir -p .log && sudo chmod 777 .log

- run:
name: Run Test
command: docker-compose run --rm odoo run_pytest.sh
# - run:
# name: Run Test
# command: docker-compose run --rm odoo run_pytest.sh

- run:
name: Codacy Coverage
command: bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l python -r .log/coverage.xml
# - run:
# name: Codacy Coverage
# command: bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l python -r .log/coverage.xml

- store_test_results:
path: .log
# - store_test_results:
# path: .log

# job that find the next tag for the current branch/repo and push the tag to github.
# it will trigger the publish of a new docker image.
auto-tag:
machine: true
steps:
- checkout
- run:
name: Get nws
command: |
curl -L $NWS_BIN_LOCATION > ./nws
chmod +x ./nws
- run:
name: Set tag
command: |
./nws circleci create-tag -t odoo-base
# auto-tag:
# machine: true
# steps:
# - checkout
# - run:
# name: Get nws
# command: |
# curl -L $NWS_BIN_LOCATION > ./nws
# chmod +x ./nws
# - run:
# name: Set tag
# command: |
# ./nws circleci create-tag -t odoo-base


workflows:
version: 2
odoo:
jobs:
- tests
- auto-tag:
context: nws
requires:
- tests
filters:
branches:
only: /^1\d\.0/
# - auto-tag:
# context: nws
# requires:
# - tests
# filters:
# branches:
# only: /^1\d\.0/
2 changes: 1 addition & 1 deletion .docker_files/main/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# © 2018 Numigi
# © 2024 Numigi
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
16 changes: 2 additions & 14 deletions .docker_files/main/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# © 2018 Numigi
# © 2024 Numigi
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).

{
Expand All @@ -11,19 +11,7 @@
"category": "Other",
"summary": "Install all addons required for testing.",
"depends": [
"hr_attendance_menu_unrestricted",
"hr_attendance_tracking_visibility",
"hr_contract_single_open",
"hr_contract_wage_type", # TA#3893
"hr_employee_declaration",
"hr_employee_private_wizard",
"hr_employee_type", # TA#15755
"hr_employee_type_private_wizard",
"hr_timesheet_enhanced", # TA51920
"hr_event", # TA#3122
"hr_expense_same_month", # TA#18858
"hr_payslip_chatter", # TA#24250
"hr_working_space", # TA#3896
"hr",
],
"installable": True,
}
3 changes: 3 additions & 0 deletions .docker_files/main/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
# © 2024 Numigi
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).

from . import test_installed_modules
2 changes: 2 additions & 0 deletions .docker_files/main/tests/test_installed_modules.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# © 2024 Numigi
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).

from odoo.tests import TransactionCase

Expand Down
2 changes: 1 addition & 1 deletion .docker_files/odoo.conf
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ test_report_directory = False
translate_modules = ['all']
unaccent = False
without_demo = False
workers = 2
workers = 0
xmlrpc = True
xmlrpc_interface =
xmlrpc_port = 8069
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: pre-commit
on:
pull_request:
branches:
- "14.0*"
- "16.0*"
push:
branches:
- "14.0"
- "16.0"

jobs:
pre-commit:
Expand Down
19 changes: 2 additions & 17 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM quay.io/numigi/odoo-public:14.latest
MAINTAINER numigi <contact@numigi.com>
FROM quay.io/numigi/odoo-public:16.latest
LABEL maintainer="contact@numigi.com"

USER root

Expand All @@ -13,20 +13,5 @@ RUN gitoo install-all --conf_file /gitoo.yml --destination "${THIRD_PARTY_ADDONS

USER odoo

COPY hr_attendance_menu_unrestricted /mnt/extra-addons/hr_attendance_menu_unrestricted
COPY hr_attendance_tracking_visibility /mnt/extra-addons/hr_attendance_tracking_visibility
COPY hr_contract_single_open /mnt/extra-addons/hr_contract_single_open
COPY hr_contract_wage_hourly /mnt/extra-addons/hr_contract_wage_hourly
COPY hr_contract_wage_type /mnt/extra-addons/hr_contract_wage_type
COPY hr_employee_declaration /mnt/extra-addons/hr_employee_declaration
COPY hr_employee_private_wizard /mnt/extra-addons/hr_employee_private_wizard
COPY hr_employee_type /mnt/extra-addons/hr_employee_type
COPY hr_timesheet_enhanced /mnt/extra-addons/hr_timesheet_enhanced
COPY hr_employee_type_private_wizard /mnt/extra-addons/hr_employee_type_private_wizard
COPY hr_event /mnt/extra-addons/hr_event
COPY hr_expense_same_month /mnt/extra-addons/hr_expense_same_month
COPY hr_payslip_chatter /mnt/extra-addons/hr_payslip_chatter
COPY hr_working_space /mnt/extra-addons/hr_working_space

COPY .docker_files/main /mnt/extra-addons/main
COPY .docker_files/odoo.conf /etc/odoo
11 changes: 5 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ services:
context: .
dockerfile: Dockerfile
volumes:
- odoo-web-data:/var/lib/odoo
- odoo16-web-data:/var/lib/odoo
- ./.log:/var/log/odoo
- ./hr_contract_wage_hourly:/mnt/extra-addons/hr_contract_wage_hourly
ports:
- "8069:8069"
- "8071:8071"
Expand All @@ -17,16 +16,16 @@ services:
environment:
- LOG_ODOO=/var/log/odoo
db:
image: postgres:9.6
image: postgres:16.0
environment:
- POSTGRES_PASSWORD=odoo
- POSTGRES_USER=odoo
- PGDATA=/var/lib/postgresql/data/pgdata
volumes:
- odoo-db-data:/var/lib/postgresql/data/pgdata
- odoo16-db-data:/var/lib/postgresql/data/pgdata
expose:
- 5432

volumes:
odoo-web-data:
odoo-db-data:
odoo16-web-data:
odoo16-db-data:
35 changes: 8 additions & 27 deletions gitoo.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,19 @@
- url: https://github.com/Numigi/odoo-base-addons
branch: "14.0"
includes:
- base_extended_security
- private_data_group
- test_http_request

- url: https://github.com/Numigi/odoo-project-addons
branch: "14.0"
includes:
- account_analytic_enhanced
- project_enhanced

- url: https://github.com/Numigi/odoo-survey-addons
branch: "14.0"
includes:
- survey_type

- url: https://github.com/oca/queue
branch: "14.0"
- url: https://github.com/OCA/queue
branch: "16.0"
includes:
- queue_job

- url: https://github.com/oca/payroll
branch: "14.0"
- url: https://github.com/OCA/payroll
branch: "16.0"
includes:
- payroll
- hr_payroll_period

- url: https://github.com/oca/server-ux
branch: "14.0"
- url: https://github.com/OCA/server-ux
branch: "16.0"
includes:
- date_range

- url: https://github.com/oca/server-tools
branch: "14.0"
- url: https://github.com/OCA/server-tools
branch: "16.0"
includes:
- base_view_inheritance_extension
32 changes: 0 additions & 32 deletions hr_attendance_menu_unrestricted/README.rst

This file was deleted.

2 changes: 0 additions & 2 deletions hr_attendance_menu_unrestricted/__init__.py

This file was deleted.

21 changes: 0 additions & 21 deletions hr_attendance_menu_unrestricted/__manifest__.py

This file was deleted.

8 changes: 0 additions & 8 deletions hr_attendance_menu_unrestricted/security/ir_rule.xml

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
16 changes: 0 additions & 16 deletions hr_attendance_menu_unrestricted/views/menu.xml

This file was deleted.

9 changes: 0 additions & 9 deletions hr_attendance_tracking_visibility/README.rst

This file was deleted.

4 changes: 0 additions & 4 deletions hr_attendance_tracking_visibility/__init__.py

This file was deleted.

21 changes: 0 additions & 21 deletions hr_attendance_tracking_visibility/__manifest__.py

This file was deleted.

4 changes: 0 additions & 4 deletions hr_attendance_tracking_visibility/models/__init__.py

This file was deleted.

Loading

0 comments on commit 5bd5871

Please sign in to comment.