ook

roles/git/tasks/main.yml

@@ -2,6 +2,25 @@
   - name: 先拉取代码
     git: repo={{ projects[project].repo }} dest={{ projects[project].dir }} accept_hostkey=yes clone=yes update=yes force=yes  
   
+  - name: 切换到master
+    command: "git checkout master"
+    args:
+      chdir: "{{ projects[project].dir }}"
+    when: type==test
+
+  - name: 合并dev
+    command: "git merge dev"
+    args:
+      chdir: "{{ projects[project].dir }}"
+    when: type==test
+
+  - name: 推送到master
+    command: "git push origin master"
+    args:
+      chdir: "{{ projects[project].dir }}"
+    when: type==test
+
+
   - name: 更新到指定版本
     command: "git checkout {{ commit }}"
     args:
@@ -18,7 +37,7 @@
   - name: 生成需要刷新的cdn url列表 
     template: src=urls.j2 dest=~/cdnurls owner=root group=root mode=0644
     when: projects[project].sync2qiniu is defined
-    
+
   - name: 同步到qiniu
     command: "qshell cdnrefresh ~/cdnurls"
     when: projects[project].sync2qiniu is defined
\ No newline at end of file

test.yml

@@ -2,6 +2,8 @@
 - name: 执行hook
   hosts: test
   become: yes
+  vars:
+    type: test
   vars_files: 
     - vars/main.yml
   roles: