tsdtm deploy scripts update

kelvich · kelvich · commit 578c08a3cb3a · 2016-02-08T16:20:16.000+03:00
diff --git a/contrib/pg_tsdtm/tests/deploy/cluster.yml b/contrib/pg_tsdtm/tests/deploy/cluster.yml
@@ -8,21 +8,12 @@
     pg_destroy_and_init: true
 
   tasks:
-  - name: clone dtm sources
-    git: repo=https://github.com/postgrespro/pg_tsdtm.git
-      dest={{pg_prefix}}/pg_dtm
-      accept_hostkey=yes
-      update=yes
-      force=yes
-    register: dtm_sources
-
-  - name: build dtm
+  - name: build tsdtm
     shell: "make clean && make -j {{makejobs}} install"
     args:
-      chdir: "{{pg_prefix}}/pg_dtm"
+      chdir: "{{pg_src}}/contrib/pg_tsdtm"
     environment:
       PG_CONFIG: "{{pg_dst}}/bin/pg_config"
-    when: dtm_sources.changed
 
   - name: enable dtm extension on datanodes
     lineinfile:
diff --git a/contrib/pg_tsdtm/tests/deploy/roles/postgres/tasks/main.yml b/contrib/pg_tsdtm/tests/deploy/roles/postgres/tasks/main.yml
@@ -42,6 +42,9 @@
 
 #############################################################################
 
+- name: stop postgres if it was running
+  shell: "pkill -9 postgres || true"
+
 - name: clone postgres sources
   git: repo={{pg_repo}}
     dest={{pg_src}}
