Skip to content
Snippets Groups Projects
Commit c63a01ed authored by Renzo Meister's avatar Renzo Meister
Browse files

Merge branch '1.0-fixed' into '1.0' 

Automatic MR created by OCA2FC Migrator

See merge request !2
parents 570eec6a aa6fc27e
No related branches found
No related tags found
1 merge request!2Automatic MR created by OCA2FC Migrator
Pipeline #459866291 failed
Stage: testall
Stage: testsingle
Show whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 61
− 61
View file @ c63a01ed
......@@ -43,21 +43,21 @@ test_all_modules:
--db_password flectra
--database test_all
--test-enable
--init hotel_restaurant,report_hotel_reservation,hotel_housekeeping_planning,hotel_housekeeping,board_frontdesk,report_hotel_restaurant,hotel,hotel_reservation
--init report_hotel_reservation,hotel,hotel_restaurant,board_frontdesk,hotel_housekeeping,report_hotel_restaurant,hotel_reservation,hotel_housekeeping_planning
--stop-after-init
--log-level error
--log-handler flectra.addons.hotel_restaurant:TEST
--log-handler flectra.addons.report_hotel_reservation:TEST
--log-handler flectra.addons.hotel_housekeeping_planning:TEST
--log-handler flectra.addons.hotel_housekeeping:TEST
--log-handler flectra.addons.hotel:TEST
--log-handler flectra.addons.hotel_restaurant:TEST
--log-handler flectra.addons.board_frontdesk:TEST
--log-handler flectra.addons.hotel_housekeeping:TEST
--log-handler flectra.addons.report_hotel_restaurant:TEST
--log-handler flectra.addons.hotel:TEST
--log-handler flectra.addons.hotel_reservation:TEST
--log-handler flectra.addons.hotel_housekeeping_planning:TEST
"
test_module_hotel_restaurant:
test_module_report_hotel_reservation:
stage: testsingle
when: on_failure
image:
......@@ -72,24 +72,24 @@ test_module_hotel_restaurant:
- wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
- 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
- export PGPASSWORD="flectra"
- createdb -h psql -U flectra -O flectra -T template1 test_hotel_restaurant
- psql -h psql -U flectra -d test_hotel_restaurant -f ${CI_PROJECT_DIR}/ci_data/dump.sql
- createdb -h psql -U flectra -O flectra -T template1 test_report_hotel_reservation
- psql -h psql -U flectra -d test_report_hotel_reservation -f ${CI_PROJECT_DIR}/ci_data/dump.sql
- su - flectra -c "mkdir -p ~/.local/share/filestore"
- mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_hotel_restaurant
- chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_hotel_restaurant
- mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_report_hotel_reservation
- chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_report_hotel_reservation
- su - flectra -c "/opt/flectra/flectra-bin
--addons-path ${CI_PROJECT_DIR}
--db_host psql
--db_port 5432
--db_user flectra
--db_password flectra
--database test_hotel_restaurant
--test-enable -i hotel_restaurant
--database test_report_hotel_reservation
--test-enable -i report_hotel_reservation
--stop-after-init
--log-level error
--log-handler flectra.addons.hotel_restaurant:TEST"
--log-handler flectra.addons.report_hotel_reservation:TEST"
test_module_report_hotel_reservation:
test_module_hotel:
stage: testsingle
when: on_failure
image:
......@@ -104,24 +104,24 @@ test_module_report_hotel_reservation:
- wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
- 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
- export PGPASSWORD="flectra"
- createdb -h psql -U flectra -O flectra -T template1 test_report_hotel_reservation
- psql -h psql -U flectra -d test_report_hotel_reservation -f ${CI_PROJECT_DIR}/ci_data/dump.sql
- createdb -h psql -U flectra -O flectra -T template1 test_hotel
- psql -h psql -U flectra -d test_hotel -f ${CI_PROJECT_DIR}/ci_data/dump.sql
- su - flectra -c "mkdir -p ~/.local/share/filestore"
- mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_report_hotel_reservation
- chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_report_hotel_reservation
- mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_hotel
- chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_hotel
- su - flectra -c "/opt/flectra/flectra-bin
--addons-path ${CI_PROJECT_DIR}
--db_host psql
--db_port 5432
--db_user flectra
--db_password flectra
--database test_report_hotel_reservation
--test-enable -i report_hotel_reservation
--database test_hotel
--test-enable -i hotel
--stop-after-init
--log-level error
--log-handler flectra.addons.report_hotel_reservation:TEST"
--log-handler flectra.addons.hotel:TEST"
test_module_hotel_housekeeping_planning:
test_module_hotel_restaurant:
stage: testsingle
when: on_failure
image:
......@@ -136,24 +136,24 @@ test_module_hotel_housekeeping_planning:
- wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
- 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
- export PGPASSWORD="flectra"
- createdb -h psql -U flectra -O flectra -T template1 test_hotel_housekeeping_planning
- psql -h psql -U flectra -d test_hotel_housekeeping_planning -f ${CI_PROJECT_DIR}/ci_data/dump.sql
- createdb -h psql -U flectra -O flectra -T template1 test_hotel_restaurant
- psql -h psql -U flectra -d test_hotel_restaurant -f ${CI_PROJECT_DIR}/ci_data/dump.sql
- su - flectra -c "mkdir -p ~/.local/share/filestore"
- mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_hotel_housekeeping_planning
- chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_hotel_housekeeping_planning
- mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_hotel_restaurant
- chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_hotel_restaurant
- su - flectra -c "/opt/flectra/flectra-bin
--addons-path ${CI_PROJECT_DIR}
--db_host psql
--db_port 5432
--db_user flectra
--db_password flectra
--database test_hotel_housekeeping_planning
--test-enable -i hotel_housekeeping_planning
--database test_hotel_restaurant
--test-enable -i hotel_restaurant
--stop-after-init
--log-level error
--log-handler flectra.addons.hotel_housekeeping_planning:TEST"
--log-handler flectra.addons.hotel_restaurant:TEST"
test_module_hotel_housekeeping:
test_module_board_frontdesk:
stage: testsingle
when: on_failure
image:
......@@ -168,24 +168,24 @@ test_module_hotel_housekeeping:
- wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
- 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
- export PGPASSWORD="flectra"
- createdb -h psql -U flectra -O flectra -T template1 test_hotel_housekeeping
- psql -h psql -U flectra -d test_hotel_housekeeping -f ${CI_PROJECT_DIR}/ci_data/dump.sql
- createdb -h psql -U flectra -O flectra -T template1 test_board_frontdesk
- psql -h psql -U flectra -d test_board_frontdesk -f ${CI_PROJECT_DIR}/ci_data/dump.sql
- su - flectra -c "mkdir -p ~/.local/share/filestore"
- mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_hotel_housekeeping
- chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_hotel_housekeeping
- mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_board_frontdesk
- chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_board_frontdesk
- su - flectra -c "/opt/flectra/flectra-bin
--addons-path ${CI_PROJECT_DIR}
--db_host psql
--db_port 5432
--db_user flectra
--db_password flectra
--database test_hotel_housekeeping
--test-enable -i hotel_housekeeping
--database test_board_frontdesk
--test-enable -i board_frontdesk
--stop-after-init
--log-level error
--log-handler flectra.addons.hotel_housekeeping:TEST"
--log-handler flectra.addons.board_frontdesk:TEST"
test_module_board_frontdesk:
test_module_hotel_housekeeping:
stage: testsingle
when: on_failure
image:
......@@ -200,22 +200,22 @@ test_module_board_frontdesk:
- wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
- 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
- export PGPASSWORD="flectra"
- createdb -h psql -U flectra -O flectra -T template1 test_board_frontdesk
- psql -h psql -U flectra -d test_board_frontdesk -f ${CI_PROJECT_DIR}/ci_data/dump.sql
- createdb -h psql -U flectra -O flectra -T template1 test_hotel_housekeeping
- psql -h psql -U flectra -d test_hotel_housekeeping -f ${CI_PROJECT_DIR}/ci_data/dump.sql
- su - flectra -c "mkdir -p ~/.local/share/filestore"
- mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_board_frontdesk
- chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_board_frontdesk
- mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_hotel_housekeeping
- chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_hotel_housekeeping
- su - flectra -c "/opt/flectra/flectra-bin
--addons-path ${CI_PROJECT_DIR}
--db_host psql
--db_port 5432
--db_user flectra
--db_password flectra
--database test_board_frontdesk
--test-enable -i board_frontdesk
--database test_hotel_housekeeping
--test-enable -i hotel_housekeeping
--stop-after-init
--log-level error
--log-handler flectra.addons.board_frontdesk:TEST"
--log-handler flectra.addons.hotel_housekeeping:TEST"
test_module_report_hotel_restaurant:
stage: testsingle
......@@ -249,7 +249,7 @@ test_module_report_hotel_restaurant:
--log-level error
--log-handler flectra.addons.report_hotel_restaurant:TEST"
test_module_hotel:
test_module_hotel_reservation:
stage: testsingle
when: on_failure
image:
......@@ -264,24 +264,24 @@ test_module_hotel:
- wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
- 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
- export PGPASSWORD="flectra"
- createdb -h psql -U flectra -O flectra -T template1 test_hotel
- psql -h psql -U flectra -d test_hotel -f ${CI_PROJECT_DIR}/ci_data/dump.sql
- createdb -h psql -U flectra -O flectra -T template1 test_hotel_reservation
- psql -h psql -U flectra -d test_hotel_reservation -f ${CI_PROJECT_DIR}/ci_data/dump.sql
- su - flectra -c "mkdir -p ~/.local/share/filestore"
- mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_hotel
- chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_hotel
- mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_hotel_reservation
- chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_hotel_reservation
- su - flectra -c "/opt/flectra/flectra-bin
--addons-path ${CI_PROJECT_DIR}
--db_host psql
--db_port 5432
--db_user flectra
--db_password flectra
--database test_hotel
--test-enable -i hotel
--database test_hotel_reservation
--test-enable -i hotel_reservation
--stop-after-init
--log-level error
--log-handler flectra.addons.hotel:TEST"
--log-handler flectra.addons.hotel_reservation:TEST"
test_module_hotel_reservation:
test_module_hotel_housekeeping_planning:
stage: testsingle
when: on_failure
image:
......@@ -296,20 +296,20 @@ test_module_hotel_reservation:
- wget -O ${CI_PROJECT_DIR}/ci_data/test_base.zip https://gitlab.com/flectra-community/devops/oca2fc/raw/master/ci_data/test_base.zip
- 7z x -o ${CI_PROJECT_DIR}/ci_data/ ${CI_PROJECT_DIR}/ci_data/test_base.zip
- export PGPASSWORD="flectra"
- createdb -h psql -U flectra -O flectra -T template1 test_hotel_reservation
- psql -h psql -U flectra -d test_hotel_reservation -f ${CI_PROJECT_DIR}/ci_data/dump.sql
- createdb -h psql -U flectra -O flectra -T template1 test_hotel_housekeeping_planning
- psql -h psql -U flectra -d test_hotel_housekeeping_planning -f ${CI_PROJECT_DIR}/ci_data/dump.sql
- su - flectra -c "mkdir -p ~/.local/share/filestore"
- mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_hotel_reservation
- chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_hotel_reservation
- mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_hotel_housekeeping_planning
- chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_hotel_housekeeping_planning
- su - flectra -c "/opt/flectra/flectra-bin
--addons-path ${CI_PROJECT_DIR}
--db_host psql
--db_port 5432
--db_user flectra
--db_password flectra
--database test_hotel_reservation
--test-enable -i hotel_reservation
--database test_hotel_housekeeping_planning
--test-enable -i hotel_housekeeping_planning
--stop-after-init
--log-level error
--log-handler flectra.addons.hotel_reservation:TEST"
--log-handler flectra.addons.hotel_housekeeping_planning:TEST"
README.md
+ 4
− 4
View file @ c63a01ed
......@@ -9,13 +9,13 @@ Available addons
addon | version | summary
--- | --- | ---
[hotel_restaurant](hotel_restaurant/) | 1.0.1.0.0| Table booking facilities and Managing customers orders
[report_hotel_reservation](report_hotel_reservation/) | 1.0.1.0.0| State-wise view for hotel reservation for better business intelligence.
[hotel_housekeeping_planning](hotel_housekeeping_planning/) | 1.0.1.0.0| Generates a planning for room housekeeping.
[hotel_housekeeping](hotel_housekeeping/) | 1.0.1.0.0| Manages Housekeeping Activities and its Process
[hotel](hotel/) | 1.0.1.0.0| Hotel Management to Manage Folio and Hotel Configuration
[hotel_restaurant](hotel_restaurant/) | 1.0.1.0.0| Table booking facilities and Managing customers orders
[board_frontdesk](board_frontdesk/) | 1.0.1.0.0| Frontdesk for hotel
[hotel_housekeeping](hotel_housekeeping/) | 1.0.1.0.0| Manages Housekeeping Activities and its Process
[report_hotel_restaurant](report_hotel_restaurant/) | 1.0.1.0.0| State-wise view for hotel restaurant for better business intelligence.
[hotel](hotel/) | 1.0.1.0.0| Hotel Management to Manage Folio and Hotel Configuration
[hotel_reservation](hotel_reservation/) | 1.0.1.0.0| Manages Guest Reservation and displays Reservation Summary
[hotel_housekeeping_planning](hotel_housekeeping_planning/) | 1.0.1.0.0| Generates a planning for room housekeeping.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment