taskotron: set default check repo branch

inventory/group_vars/taskotron-dev

@@ -27,6 +27,7 @@ grokmirror_repos:
   - { name: fedoraqa/examplelong, url: 'https://bitbucket.org/fedoraqa/task-examplelong.git'}
   - { name: fedoraqa/examplebodhi, url: 'https://bitbucket.org/fedoraqa/task-examplebodhi.git'}
   - { name: fedoraqa/upgradepath, url: 'https://bitbucket.org/fedoraqa/task-upgradepath.git'}
+grokmirror_default_branch: develop
 
 
 ############################################################

inventory/group_vars/taskotron-prod

@@ -21,6 +21,8 @@ grokmirror_repos:
   - { name: fedoraqa/depcheck, url: 'https://bitbucket.org/fedoraqa/task-depcheck.git'}
   - { name: fedoraqa/upgradepath, url: 'https://bitbucket.org/fedoraqa/task-upgradepath.git'}
 grokmirror_user: grokmirror
+grokmirror_default_branch: master
+
 
 ############################################################
 # urls and endpoints

inventory/group_vars/taskotron-stg

@@ -24,6 +24,10 @@ grokmirror_repos:
   - { name: fedoraqa/rpmlint, url: 'https://bitbucket.org/fedoraqa/task-rpmlint.git'}
   - { name: fedoraqa/depcheck, url: 'https://bitbucket.org/fedoraqa/task-depcheck.git'}
   - { name: fedoraqa/upgradepath, url: 'https://bitbucket.org/fedoraqa/task-upgradepath.git'}
+# XXX currently develop branches are too new to be running on stg,
+# remember to revert it once new rpms are on stg
+grokmirror_default_branch: master
+
 
 ############################################################
 # urls and endpoints

playbooks/update_grokmirror_repos.yml

@@ -1,8 +1,5 @@
 # update all mirrors currently served by grokmirror
 
-# XXX currently develop branches are too new to be running on stg,
-# remember to revert it once new rpms are on stg
-
 - name: update grokmirror repos
   hosts: taskotron-dev:taskotron-stg:taskotron-prod
   sudo: true
@@ -10,13 +7,7 @@
   gather_facts: false
 
   tasks:
-     - name: update grokmirror repos to develop branches
+     - name: update grokmirror repos
-       when: deployment_type == 'dev'
+       command: chdir={{ grokmirror_basedir }}/{{ item.name }} git fetch origin {{ grokmirror_default_branch }}:{{ grokmirror_default_branch }}
-       command: chdir={{ grokmirror_basedir }}/{{ item.name }} git fetch origin develop:develop
-       with_items: grokmirror_repos
-
-     - name: update grokmirror repos to master branches
-       when: deployment_type == 'stg' or deployment_type == 'prod'
-       command: chdir={{ grokmirror_basedir }}/{{ item.name }} git fetch origin master:master
        with_items: grokmirror_repos
 

roles/taskotron/grokmirror/tasks/main.yml

@@ -37,5 +37,11 @@
   sudo_user: "{{ grokmirror_user }}"
   with_items: grokmirror_repos
 
+- name: set up default branch
+  command: chdir={{ grokmirror_basedir }}/{{ item.name }} git symbolic-ref HEAD refs/heads/{{ grokmirror_default_branch }}
+  sudo: true
+  sudo_user: "{{ grokmirror_user }}"
+  with_items: grokmirror_repos
+
 - name: generate grokmirror config
   template: src=repos.conf.j2 dest=/etc/grokmirror/repos.conf owner={{ grokmirror_user }} group={{ grokmirror_user }} mode=0644