Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit d6d046c

Browse files
committed
Squashed 'contrib/pg_shardman/' changes from 33558f1..ce2d63f
ce2d63f cd into dir with python tests. 7d4420b Remove all symlinks to meet pgfarm requirments. 1910fc2 Remove dangling symlinks git-subtree-dir: contrib/pg_shardman git-subtree-split: ce2d63f
1 parent 1d99399 commit d6d046c

8 files changed

+20
-7
lines changed

devops/send_config.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,21 @@
99
---
1010
- hosts: shardlord
1111
tasks:
12+
# jinja2 won't work with outside files, so first copy them to templates/ dir,
13+
# oh my... see https://github.com/ansible/ansible/issues/7106
14+
# I used to create a bunch of (possibly dangled) symlinks, but pgfarm doesn't
15+
# like that.
16+
- name: cp configs into template dir
17+
local_action: >
18+
shell cp ../postgresql.conf.common templates/postgresql.conf.common 2>/dev/null || : ;
19+
cp ../postgresql.conf.lord templates/postgresql.conf.lord 2>/dev/null || : ;
20+
cp ../postgresql.conf.worker templates/postgresql.conf.worker 2>/dev/null || : ;
21+
22+
cp postgresql.conf.common templates/postgresql.conf.devops.common 2>/dev/null || : ;
23+
cp postgresql.conf.lord templates/postgresql.conf.devops.lord 2>/dev/null || : ;
24+
cp postgresql.conf.worker templates/postgresql.conf.devops.worker 2>/dev/null || : ;
25+
run_once: true
26+
1227
- name: copy postgresql.conf to shardlord
1328
template:
1429
src=templates/postgresql.conf.lord.j2

devops/templates/postgresql.conf.common

Lines changed: 0 additions & 1 deletion
This file was deleted.

devops/templates/postgresql.conf.devops.common

Lines changed: 0 additions & 1 deletion
This file was deleted.

devops/templates/postgresql.conf.devops.lord

Lines changed: 0 additions & 1 deletion
This file was deleted.

devops/templates/postgresql.conf.devops.worker

Lines changed: 0 additions & 1 deletion
This file was deleted.

devops/templates/postgresql.conf.lord

Lines changed: 0 additions & 1 deletion
This file was deleted.

devops/templates/postgresql.conf.worker

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/python/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1+
# we need to cd into dir with tests.py, otherwise unittest won't find it
2+
# dir containing this makefile
3+
mkfile_dir := $(shell dirname $(shell readlink -f $(abspath $(lastword $(MAKEFILE_LIST)))))
4+
15
all:
2-
python3 -m unittest tests.py -v -f
6+
cd $(mkfile_dir) && python3 -m unittest tests.py -v -f

0 commit comments

Comments
 (0)