mirror of
https://github.com/odoo/runbot.git
synced 2025-03-15 23:45:44 +07:00
[FIX] runbot: add dbuser parameter to the odoo cmd
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:
parent
b539112a7e
commit
12acfda83a
@ -1,22 +1,19 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import glob
|
||||
import logging
|
||||
import operator
|
||||
import os
|
||||
import pwd
|
||||
import re
|
||||
import resource
|
||||
import shlex
|
||||
import shutil
|
||||
import signal
|
||||
import subprocess
|
||||
import time
|
||||
from subprocess import CalledProcessError
|
||||
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 odoo import models, fields, api
|
||||
from odoo.exceptions import UserError
|
||||
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_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)
|
||||
cmd += ["--data-dir", '/data/build/datadir']
|
||||
|
||||
# if build.branch_id.test_tags:
|
||||
# cmd.extend(['--test_tags', "'%s'" % build.branch_id.test_tags]) # keep for next version
|
||||
# use the username of the runbot host to connect to the databases
|
||||
cmd += ['-r %s' % pwd.getpwuid(os.getuid()).pw_name]
|
||||
|
||||
return cmd, build.modules
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user