Skip to content

Commit

Permalink
TA#66731 [ADD][16.0] Set Deplaiement Config (#148)
Browse files Browse the repository at this point in the history
  • Loading branch information
majouda authored Jul 2, 2024
1 parent 6ebbeaf commit 9af4420
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 32 deletions.
48 changes: 22 additions & 26 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,24 @@ jobs:
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

# - 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
Expand All @@ -48,10 +44,10 @@ workflows:
- tests:
context: quay.io

# - 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/odoo.conf
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ log_handler = :INFO
log_level = info
logfile = None
logrotate = False
longpolling_port = 8071
gevent-port = 8071
max_cron_threads = 1
transient_age_limit = 1.0
transient_count_limit = False
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ LABEL maintainer="[email protected]"

USER root

ARG GIT_TOKEN

COPY .docker_files/test-requirements.txt ./test-requirements.txt
RUN pip3 install -r ./test-requirements.txt && rm ./test-requirements.txt

Expand Down
3 changes: 0 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
version: '3'
services:
odoo:
build:
context: .
dockerfile: Dockerfile
args:
- GIT_TOKEN=${GIT_TOKEN}
volumes:
- odoo16-base-data:/var/lib/odoo
- ./.log:/var/log/odoo
Expand Down

0 comments on commit 9af4420

Please sign in to comment.