mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-22 09:57:41 +00:00
Code Issues Releases Wiki Activity

[#1811] hammer.py: set timezone in postgres

Browse Source
This commit is contained in:
Andrei Pavel 2021-04-19 15:41:40 +03:00
parent a15bb66e94
commit 24bb5dc365
No known key found for this signature in database
GPG Key ID: 86E9385BC2203766
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hammer.py
View File

@ -289,7 +289,7 @@ def execute(cmd, timeout=60, cwd=None, env=None, raise_error=True, dry_run=False
while p.poll() is None and (timeout is None or t1 - t0 < timeout): while p.poll() is None and (timeout is None or t1 - t0 < timeout):
line = p.stdout.readline() line = p.stdout.readline()
if line: if line:
line_decoded = line.decode(encoding='ascii', errors='ignore').rstrip() line_decoded = line.decode(encoding='ascii', errors='ignore').rstrip() + '\r'
if not quiet: if not quiet:
print(line_decoded) print(line_decoded)
if capture: if capture:
@ -959,7 +959,7 @@ def _install_gtest_sources():
os.unlink('/tmp/gtest.tar.gz') os.unlink('/tmp/gtest.tar.gz')
def _local_timezone(): def _get_local_timezone():
_, output = execute(''' _, output = execute('''
# timedatectl # timedatectl
if command -v timedatectl > /dev/null 2>&1; then if command -v timedatectl > /dev/null 2>&1; then
@ -967,7 +967,7 @@ def _local_timezone():
exit ${?} exit ${?}
fi fi
# brute force # brute force: for Alpine, FreeBSD
for i in $(find /usr/share/zoneinfo | cut -d '/' -f 5- | grep -E '^[A-Z][a-z]+/[A-Z][a-z]+$' | sort -uV); do for i in $(find /usr/share/zoneinfo | cut -d '/' -f 5- | grep -E '^[A-Z][a-z]+/[A-Z][a-z]+$' | sort -uV); do
unset TZ unset TZ
if test "$(date)" = "$(TZ="${i}" date)"; then if test "$(date)" = "$(TZ="${i}" date)"; then
@ -976,7 +976,7 @@ def _local_timezone():
fi fi
done done
''', capture=True, quiet=True) ''', capture=True, quiet=True)
return output return output.rstrip()
def _configure_mysql(system, revision, features): def _configure_mysql(system, revision, features):
@ -1075,7 +1075,7 @@ def _configure_pgsql(system, features):
CREATE USER keatest_readonly WITH PASSWORD 'keatest'; CREATE USER keatest_readonly WITH PASSWORD 'keatest';
CREATE DATABASE keatest; CREATE DATABASE keatest;
GRANT ALL PRIVILEGES ON DATABASE keatest TO keatest; GRANT ALL PRIVILEGES ON DATABASE keatest TO keatest;
ALTER DATABASE keatest SET TIMEZONE='""" + _local_timezone() + "';\n" ALTER DATABASE keatest SET TIMEZONE='{}';\n""".format(_get_local_timezone())
cmd += 'EOF\n"' cmd += 'EOF\n"'
execute(cmd, cwd='/tmp') # CWD to avoid: could not change as postgres user directory to "/home/jenkins": Permission denied execute(cmd, cwd='/tmp') # CWD to avoid: could not change as postgres user directory to "/home/jenkins": Permission denied