Skip to content

Commit

Permalink
Fix py35/py36 and k-a-ubuntu-source gate jobs
Browse files Browse the repository at this point in the history
- py35/py36 jobs are failing
python 3.6 pycache also includes links - so those also
need to be removed by tox testenv

- kolla-ansible-ubuntu-source job is failing
Without basedir set in galera.cnf - mysql_install_db looks for resolveip
in /usr/sbin, instead of /usr/bin, thus complains about cannot resolving
neither $HOSTNAME, nor localhost.

Change-Id: I40514c0a7c43ae01c7680aac81123942be1cdef9
  • Loading branch information
Michal Nasiadka committed Feb 14, 2019
1 parent c2f3ba3 commit 189af13
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions ansible/roles/mariadb/templates/galera.cnf.j2
Expand Up @@ -8,6 +8,9 @@ default-character-set=utf8
default-character-set=utf8

[mysqld]
{% if kolla_base_distro in ['debian', 'ubuntu'] %}
basedir=/usr
{% endif %}
bind-address={{ api_interface_address }}
port={{ mariadb_port }}

Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Expand Up @@ -15,7 +15,7 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE OS_TEST_TIMEOUT
PYTHON OS_TEST_PATH LISTOPT IDOPTION
commands =
find . -type f -name "*.py[c|o]" -delete
find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
find . -type d -name "__pycache__" -delete
stestr run --slowest {posargs}

Expand Down

0 comments on commit 189af13

Please sign in to comment.