NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot: add dbuser parameter to the odoo cmd

Browse Source 
When running Odoo in the Docker container, the username used to connect
to the database is the username defined in the docker container
(actually odoo).

A problem may arise if the user of the runbot process is not the same.
An authentication error is then raised by postgres because of the
username mismatch.

With this commit, the '-r' parameter of Odoo is added to the command
with the username used by the runbot process.

While at it, unused imports are removed.
This commit is contained in:
Christophe Monniez 2019-05-03 17:03:00 +02:00
parent b539112a7e
commit 12acfda83a
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
runbot/models/build.py
View File

@ -1,22 +1,19 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import glob import glob
import logging import logging
import operator
import os import os
import pwd
import re import re
import resource
import shlex import shlex
import shutil import shutil
import signal
import subprocess import subprocess
import time import time
from subprocess import CalledProcessError
from ..common import dt2time, fqdn, now, grep, time2str, rfind, uniq_list, local_pgadmin_cursor, get_py_version from ..common import dt2time, fqdn, now, grep, time2str, rfind, uniq_list, local_pgadmin_cursor, get_py_version
from ..container import docker_build, docker_run, docker_stop, docker_is_running, docker_get_gateway_ip, build_odoo_cmd from ..container import docker_build, docker_run, docker_stop, docker_is_running, docker_get_gateway_ip, build_odoo_cmd
from odoo import models, fields, api from odoo import models, fields, api
from odoo.exceptions import UserError from odoo.exceptions import UserError
from odoo.http import request from odoo.http import request
from odoo.tools import config, appdirs from odoo.tools import appdirs
_re_error = r'^(?:\d{4}-\d\d-\d\d \d\d:\d\d:\d\d,\d{3} \d+ (?:ERROR|CRITICAL) )|(?:Traceback \(most recent call last\):)$' _re_error = r'^(?:\d{4}-\d\d-\d\d \d\d:\d\d:\d\d,\d{3} \d+ (?:ERROR|CRITICAL) )|(?:Traceback \(most recent call last\):)$'
_re_warning = r'^\d{4}-\d\d-\d\d \d\d:\d\d:\d\d,\d{3} \d+ WARNING ' _re_warning = r'^\d{4}-\d\d-\d\d \d\d:\d\d:\d\d,\d{3} \d+ WARNING '
@ -674,8 +671,8 @@ class runbot_build(models.Model):
os.mkdir(datadir) os.mkdir(datadir)
cmd += ["--data-dir", '/data/build/datadir'] cmd += ["--data-dir", '/data/build/datadir']
# if build.branch_id.test_tags: # use the username of the runbot host to connect to the databases
# cmd.extend(['--test_tags', "'%s'" % build.branch_id.test_tags]) # keep for next version cmd += ['-r %s' % pwd.getpwuid(os.getuid()).pw_name]
return cmd, build.modules return cmd, build.modules