changing taskotron-prod, resultsdb-prod over to f21, adding execdb, enabling artifacts

inventory/group_vars/resultsdb-prod

@@ -11,7 +11,7 @@ fas_client_groups: sysadmin-qa
 nrpe_procs_warn: 250
 nrpe_procs_crit: 300
 
-virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
+virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
                  --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
                  --vcpus={{ num_cpus }}  -l {{ ks_repo }} -x
                  "ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
@@ -20,10 +20,19 @@ virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ me
                  --network=bridge=br0,model=virtio --autostart --noautoconsole
 
 deployment_type: prod
+
 resultsdb_db_host: db-qa01.qa.fedoraproject.org
 resultsdb_db_port: 5432
 resultsdb_endpoint: 'resultsdb_api'
 resultsdb_fe_endpoint: 'resultsdb'
 resultsdb_db_name: resultsdb
+
+execdb_db_host: db-qa01.qa.fedoraproject.org
+execdb_db_port: 5432
+execdb_endpoint: 'execdb'
+execdb_db_name: execdb
+
+external_hostname: taskotron.fedoraproject.org
+
 allowed_hosts:
     - 10.5.124

inventory/group_vars/taskotron-prod

@@ -27,3 +27,5 @@ deployment_type: prod
 tcp_ports: [ 80, 443, "{{ buildslave_port }}" ]
 taskotron_docs_url: https://docs.qadevel.cloud.fedoraproject.org/libtaskotron/latest/
 public_artifacts_dir: /srv/taskotron/artifacts
+execdb_server: http://resultsdb01.qa.fedoraproject.org/execdb
+execdb_statuspush: http://resultsdb01.qa.fedoraproject.org/execdb/buildbottest

inventory/host_vars/resultsdb01.qa.fedoraproject.org

@@ -2,10 +2,21 @@
 nm: 255.255.255.0
 gw: 10.5.124.254
 dns: 10.5.126.21
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-20
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-21
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/20/Fedora/x86_64/os/
+ks_repo: http://10.5.126.23/pub/fedora/linux/releases/21/Server/x86_64/os/
 volgroup: /dev/VirtGuests
 eth0_ip: 10.5.124.207
 vmhost: virthost-comm03.qa.fedoraproject.org
 datacenter: phx2
 sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
+
+# default virt install command is for a single nic-device
+# define in another group file for more nics (see buildvm)
+virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
+                 --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
+                 --vcpus={{ num_cpus }}  -l {{ ks_repo }} -x
+                 "ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }}
+                  gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0
+                  hostname={{ inventory_hostname }}"
+                 --network=bridge=br0 --autostart --noautoconsole
+

inventory/host_vars/taskotron01.qa.fedoraproject.org

@@ -2,14 +2,15 @@
 nm: 255.255.255.0
 gw: 10.5.124.254
 dns: 10.5.126.21
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-20
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-21-taskotron-master
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/20/Fedora/x86_64/os/
+ks_repo: http://10.5.126.23/pub/fedora/linux/releases/21/Server/x86_64/os/
 volgroup: /dev/VirtGuests
 eth0_ip: 10.5.124.206
 vmhost: virthost-comm03.qa.fedoraproject.org
 datacenter: phx2
 fas_client_groups: sysadmin-qa,sysadmin-main
 sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
+lvm_size: 45000
 
 # default virt install command is for a single nic-device
 # define in another group file for more nics (see buildvm)

playbooks/groups/resultsdb-prod.yml

@@ -63,6 +63,7 @@
   roles:
    - { role: taskotron/resultsdb-backend, tags: ['resultsdb-be'] }
    - { role: taskotron/resultsdb-frontend, tags: ['resultsdb-fe'] }
+   - { role: taskotron/execdb, tags: ['execdb'] }
 
   handlers:
    - include: "{{ handlers }}/restart_services.yml"

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

@@ -126,12 +126,10 @@ c['schedulers'].append(ForceScheduler(
                                             label='type of object to use',
                                             default='',
                                             size=256),
-{% if deployment_type == 'dev' %}
                             StringParameter(name='uuid',
                                             label='UUID of the build in progress',
                                             default='',
                                             size=256),
-{% endif %}
                             StringParameter(name='arch',
                                             label='arch of rpm to test',
                                             default='x86_64',
@@ -169,9 +167,7 @@ factory.addStep(ShellCommand(command=["runtask",
                                         '-t', Interpolate('%(prop:item_type)s'),
                                         '-a', Interpolate('%(prop:arch)s'),
                                         '-j', Interpolate('%(prop:buildername)s/%(prop:buildnumber)s'),
-{% if deployment_type in ['dev', 'stg'] %}
                                         '--uuid', Interpolate('%(prop:uuid)s'),
-{% endif %}
                                         Interpolate('%(prop:taskname)s.yml')],
                              descriptionDone=[Interpolate('%(prop:taskname)s on %(prop:item)s')],
                              name='runtask',
@@ -179,7 +175,6 @@ factory.addStep(ShellCommand(command=["runtask",
                              logfiles={'taskotron.log': {'filename': '/var/log/taskotron/taskotron.log', }}))
 
 
-{% if deployment_type in ['dev', 'stg'] %}
 # create artifacts dir on master
 factory.addStep(MasterShellCommand(command=["mkdir", '-m', '0755', Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s')],
                                    descriptionDone=['Create artifacs dir']))
@@ -202,11 +197,6 @@ def today(props):
 # move artifacts dir
 factory.addStep(MasterShellCommand(command=Interpolate('mkdir -p -m 0755 {{ public_artifacts_dir }}/%(kw:today)s && mkdir -p -m 0755 {{ public_artifacts_dir }}/all && mv {{ public_artifacts_dir }}/%(prop:uuid)s/ {{ public_artifacts_dir }}/%(kw:today)s/ && ln -s {{ public_artifacts_dir }}/%(kw:today)s/%(prop:uuid)s {{ public_artifacts_dir }}/all/', today=today),
                                    descriptionDone=['Move artifacs dir']))
-{% else %}
-# capture the taskotron log
-factory.addStep(ShellCommand(command=["cat", "/var/log/taskotron/taskotron.log"], name="cat_log",
-                            descriptionDone=['Store log']))
-{% endif %}
 
 ####### RESOURCE LOCKS
 #
@@ -363,14 +353,12 @@ mn = MailNotifier(fromaddr='taskotron@fedoraproject.org',
 
 c['status'].append(mn)
 
-{% if deployment_type in ['dev', 'stg'] %}
 # ExecDB's push-notifications:
 import buildbot.status.status_push
 sp = buildbot.status.status_push.HttpStatusPush(
         serverUrl="{{ execdb_statuspush }}",
         debug=True)
 c['status'].append(sp)
-{% endif %}
 
 ####### PROJECT IDENTITY