qadevel-stg: do not use grokmirror and postgresql

inventory/group_vars/qadevel-stg

@@ -19,21 +19,11 @@ virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ m
                   hostname={{ inventory_hostname }}"
                  --network=bridge=br0 --autostart --noautoconsole
 
-grokmirror_basedir: /var/lib/git/mirror
-grokmirror_user: grokmirror
-grokmirror_repos:
-  - { name: fedoraqa/taskotron-trigger, url: 'https://bitbucket.org/fedoraqa/taskotron-triger.git'}
-  - { name: fedoraqa/libtaskotron, url: 'https://bitbucket.org/fedoraqa/libtaskotron.git'}
-  - { name: fedoraqa/resultsdb, url: 'https://bitbucket.org/fedoraqa/resultsdb.git'}
-  - { name: fedoraqa/resultsdb_api, url: 'https://bitbucket.org/fedoraqa/resultsdb_api.git'}
-  - { name: fedoraqa/fake_fedorainfra, url: 'https://bitbucket.org/fedoraqa/fake_fedorainfra.git'}
-buildmaster_db_host: db-qa01.qa.fedoraproject.org
 buildmaster_db_name: buildmaster_ci_stg
 buildmaster_template: ci.master.cfg.j2
 buildmaster_endpoint: taskmaster
 buildslave_ssh_pubkey: ''
 buildslave_port: 9989
-cgit_root_title: "Taskotron CI Stg Server Git Mirror"
 buildmaster_dir: /home/buildmaster/master
 buildslave_dir: /home/buildslave/slave
 buildslave_poll_interval: 1800

playbooks/groups/qadevel-stg.yml

@@ -63,8 +63,6 @@
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   roles:
-   - { role: taskotron/grokmirror, tags: ['grokmirror'] }
-#   - { role: taskotron/cgit, tags: ['cgit'] }
    - { role: taskotron/buildmaster, tags: ['buildmaster'] }
    - { role: taskotron/buildmaster-configure, tags: ['buildmasterconfig'] }
 

roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2

@@ -17,10 +17,10 @@ from buildbot.buildslave import BuildSlave
 c['slaves'] = [
                 {% for buildslave in buildslaves %}
                 {% if deployment_type == 'stg' %}
-                BuildSlave("{{ buildslave }}", "{{ stg_buildslave_password }}"),
+                BuildSlave("{{ buildslave }}", "{{ qadevel_stg_buildslave_password }}"),
                 {% endif %}
                 {% if deployment_type == 'prod' %}
-                BuildSlave("{{ buildslave }}", "{{ prod_buildslave_password }}"),
+                BuildSlave("{{ buildslave }}", "{{ qadevel_prod_buildslave_password }}"),
                 {% endif %}
                 {% endfor %}
               ]
@@ -42,31 +42,31 @@ interval = {{ buildslave_poll_interval }}
 
 c['change_source'] = []
 c['change_source'].append(GitPoller(
-        '{{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/taskotron-trigger/',
+        'https://bitbucket.org/fedoraqa/taskotron-trigger.git',
         workdir='gitpoller-workdir-trigger', branch='develop',
         pollinterval=interval,
         project='trigger'))
 
 c['change_source'].append(GitPoller(
-        '{{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/libtaskotron/',
+        'https://bitbucket.org/fedoraqa/libtaskotron.git',
         workdir='gitpoller-workdir-libtaskotron', branch='develop',
         pollinterval=interval,
         project='libtaskotron'))
 
 c['change_source'].append(GitPoller(
-        '{{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/resultsdb/',
+        'https://bitbucket.org/fedoraqa/resultsdb.git',
         workdir='gitpoller-workdir-resultsdb', branch='develop',
         pollinterval=interval,
         project='resultsdb'))
 
 c['change_source'].append(GitPoller(
-        '{{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/resultsdb_api/',
+        'https://bitbucket.org/fedoraqa/resultsdb_api.git',
         workdir='gitpoller-workdir-resultsdb_api', branch='develop',
         pollinterval=interval,
         project='resultsdb_api'))
 
 c['change_source'].append(GitPoller(
-        '{{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/fake_fedorainfra/',
+        'https://bitbucket.org/fedoraqa/fake_fedorainfra.git',
         workdir='gitpoller-workdir-fake_fedorainfra', branch='develop',
         pollinterval=interval,
         project='fake_fedorainfra'))
@@ -122,7 +122,7 @@ from buildbot.steps.shell import ShellCommand
 
 def create_test_factory(repo_name, func=True):
     factory = BuildFactory()
-    factory.addStep(Git(repourl=Interpolate('{{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/%s/' % repo_name),
+    factory.addStep(Git(repourl=Interpolate('https://bitbucket.org/fedoraqa/%s.git' % repo_name),
                     mode='full', method='clobber'))
     factory.addStep(ShellCommand(command=['virtualenv', '--system-site-packages', 'env']))
     factory.addStep(ShellCommand(command=['bash', '-c', 'source env/bin/activate; pip install -r requirements.txt']))
@@ -178,10 +178,10 @@ authz_cfg=authz.Authz(
     # change any of these to True to enable; see the manual for more
     # options
     {% if deployment_type == 'stg' %}
-    auth=auth.BasicAuth([("{{ stg_buildbot_user }}","{{ stg_buildbot_password }}")]),
+    auth=auth.BasicAuth([("{{ qadevel_stg_buildbot_master_user }}","{{ qadevel_stg_buildbot_master_password }}")]),
     {% endif %}
     {% if deployment_type == 'prod' %}
-    auth=auth.BasicAuth([("{{ prod_buildbot_user }}","{{ prod_buildbot_password }}")]),
+    auth=auth.BasicAuth([("{{ qadevel_prod_buildbot_master_user }}","{{ qadevel_prod_buildbot_master_password }}")]),
     {% endif %}
     gracefulShutdown = False,
     forceBuild = 'auth', # use this to test your slave once it is set up
@@ -293,11 +293,5 @@ c['buildbotURL'] = "http://{{ external_hostname }}/{{buildmaster_endpoint}}/"
 c['db'] = {
     # This specifies what database buildbot uses to store its state.  You can leave
     # this at its default for all but the largest installations.
-    #'db_url' : "sqlite:///state.sqlite",
-    {% if deployment_type == 'stg' %}
-    'db_url' : "postgresql://{{ stg_buildmaster_db_user }}:{{ stg_buildmaster_db_password }}@{{ buildmaster_db_host }}/{{ buildmaster_db_name }}",
-    {% endif %}
-    {% if deployment_type == 'prod' %}
-    'db_url' : "postgresql://{{ prod_buildmaster_db_user }}:{{ prod_buildmaster_db_password }}@{{ buildmaster_db_host }}/{{ buildmaster_db_name }}",
-    {% endif %}
+    'db_url' : "sqlite:///state.sqlite",
 }